Rijn/Advanced-Software-Engineering-Drawing-Project
Private
Public Access
1
0 Fork 0
Code Activity

Code cleanup

Browse Source
This commit is contained in:
Lukasz Baldyga committed 2020-12-03 23:24:44 +00:00
1 parent 72b5db624f
commit 39dc69d7b1
11 files changed
+27 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Advanced Software Engineering/Advanced Software Engineering/App.config
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
</configuration>
Advanced Software Engineering/Advanced Software Engineering/Drawer.cs
+2 -4
View File
@@ -12,8 +12,7 @@ namespace Advanced_Software_Engineering {
/// The drawer is responsible for drawing on the graphics object.
/// </summary>
public class Drawer {
private ValueStorage valueStorage = new ValueStorage();
private readonly ValueStorage valueStorage = new ValueStorage();
public List<IVerbChunk> verbChunks = new List<IVerbChunk>();
public bool verbChunkGeneratingMethod = false;
public Dictionary<string, MethodChunk> Methods = new Dictionary<string, MethodChunk>();
@@ -154,7 +153,7 @@ namespace Advanced_Software_Engineering {
//Make it relative to the pen
for (int pointIndex = 0; pointIndex < points.Length; pointIndex++)
points[pointIndex] = new Point(points[pointIndex].X + penPosition.X, points[pointIndex].Y+ penPosition.Y);
points[pointIndex] = new Point(points[pointIndex].X + penPosition.X, points[pointIndex].Y + penPosition.Y);
GraphicsPath path = new GraphicsPath {
FillMode = FillMode.Winding
@@ -202,6 +201,5 @@ namespace Advanced_Software_Engineering {
public ValueStorage GetValueStorage() {
return valueStorage;
}
}
}
Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/NoOp.cs
+3 -2
View File
@@ -1,7 +1,8 @@
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs.Actions {
class NoOp : IVerb {
public void ExecuteVerb() {
internal class NoOp : IVerb {
public void ExecuteVerb() {
}
public string GetDescription() {
Advanced Software Engineering/Advanced Software Engineering/Verbs/Flow/DeclareMethod.cs
+4 -11
View File
@@ -1,15 +1,8 @@
using Advanced_Software_Engineering.Verbs.Value;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Advanced_Software_Engineering.Verbs.Flow {
class DeclareMethod : IVerb, IVerbChunk {
string methodName;
Drawer drawer;
namespace Advanced_Software_Engineering.Verbs.Flow {
internal class DeclareMethod : IVerb, IVerbChunk {
private readonly string methodName;
private readonly Drawer drawer;
public DeclareMethod(Drawer drawer, string methodName) {
this.drawer = drawer;
Advanced Software Engineering/Advanced Software Engineering/Verbs/Flow/IVerbChunk.cs
+2 -6
View File
@@ -1,11 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Advanced_Software_Engineering.Verbs.Flow {
namespace Advanced_Software_Engineering.Verbs.Flow {
public interface IVerbChunk : IVerb {
void AddVerb(IVerb verb);
void ExecuteVerb();
Advanced Software Engineering/Advanced Software Engineering/Verbs/Flow/IfChunk.cs
+3 -4
View File
@@ -2,10 +2,10 @@
using System.Collections.Generic;
namespace Advanced_Software_Engineering.Verbs.Flow {
public class IfChunk : VerbChunk, IVerbChunk, IVerb {
IValue conditional;
ValueStorage valueStorage;
public class IfChunk : VerbChunk, IVerbChunk, IVerb {
private readonly IValue conditional;
private readonly ValueStorage valueStorage;
public IfChunk(ValueStorage valueStorage, IValue conditional) : base() {
this.conditional = conditional;
@@ -24,6 +24,5 @@ namespace Advanced_Software_Engineering.Verbs.Flow {
if (conditional.ToBool()) base.ExecuteVerb();
valueStorage.DecreaseStack();
}
}
}
Advanced Software Engineering/Advanced Software Engineering/Verbs/Flow/MethodChunk.cs
+6 -8
View File
@@ -1,16 +1,15 @@
using Advanced_Software_Engineering.Verbs.Value;
using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
using System.Collections.Generic;
using System.Drawing;
namespace Advanced_Software_Engineering.Verbs.Flow {
public class MethodChunk : VerbChunk, IVerb, IValue {
ValueStorage valueStorage;
DeclareVariable[] variables;
UpdateVariable[] updateVariables;
bool init = false;
IValue result;
public class MethodChunk : VerbChunk, IVerb, IValue {
private readonly ValueStorage valueStorage;
private readonly DeclareVariable[] variables;
private UpdateVariable[] updateVariables;
private bool init = false;
private IValue result;
public MethodChunk(ValueStorage valueStorage, DeclareVariable[] variables) : base() {
this.valueStorage = valueStorage;
@@ -59,7 +58,6 @@ namespace Advanced_Software_Engineering.Verbs.Flow {
init = true;
}
valueStorage.DecreaseStack();
}
public IValue GetResult() {
Advanced Software Engineering/Advanced Software Engineering/Verbs/Flow/WhileChunk.cs
+3 -4
View File
@@ -2,10 +2,10 @@
using System.Collections.Generic;
namespace Advanced_Software_Engineering.Verbs.Flow {
public class WhileChunk : VerbChunk, IVerbChunk, IVerb {
IValue conditional;
ValueStorage valueStorage;
public class WhileChunk : VerbChunk, IVerbChunk, IVerb {
private readonly IValue conditional;
private readonly ValueStorage valueStorage;
public WhileChunk(ValueStorage valueStorage, IValue conditional) : base() {
this.conditional = conditional;
@@ -24,6 +24,5 @@ namespace Advanced_Software_Engineering.Verbs.Flow {
while (conditional.ToBool()) base.ExecuteVerb();
valueStorage.DecreaseStack();
}
}
}
Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueStorage.cs
+2 -2
View File
@@ -2,8 +2,8 @@
using System.Collections.Generic;
namespace Advanced_Software_Engineering.Verbs.Value {
public class ValueStorage {
public class ValueStorage {
protected int currentStack;
protected List<Dictionary<string, IValue>> Variables = new List<Dictionary<string, IValue>>();
@@ -21,7 +21,7 @@ namespace Advanced_Software_Engineering.Verbs.Value {
if (stack < 0) throw new Exception("Stack cannot be less than 0");
//Decreased Stack
if(currentStack > stack) {
if (currentStack > stack) {
Variables.RemoveAt(currentStack);
}
//Increased Stack
Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ExpressionValue.cs
+1 -1
View File
@@ -13,7 +13,7 @@ namespace Advanced_Software_Engineering.Verbs.Value {
private readonly IValue variable2;
private readonly int operation;
private bool evaluated = false;
private readonly bool evaluated = false;
private IValue evaluatedValue;
public ExpressionValue(IValue variable1, IValue variable2, int operation) {
Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs
-5
View File
@@ -26,7 +26,6 @@ namespace Advanced_Software_Engineering {
public static IVerb MakeVerb(Drawer drawer, string fullCommand) {
ValueStorage rootValueStorage = drawer.GetValueStorage();
List<IVerbChunk> verbChunks = drawer.verbChunks;
if (verbChunks.Count == 0) verbChunks.Add(null);
@@ -78,7 +77,6 @@ namespace Advanced_Software_Engineering {
}
}
//Parse flow verbs
switch (command) {
case "if":
@@ -162,7 +160,6 @@ namespace Advanced_Software_Engineering {
//Handle errors
if (methodVariableNames.Length != parameterLength) throw new Exception("Method " + command + "Has an incorrect number of parameters");
/* So something like this:
* def abc d
* circle d
@@ -177,7 +174,6 @@ namespace Advanced_Software_Engineering {
*
*/
// Update the values of the variables
List<UpdateVariable> UpdateVariableList = new List<UpdateVariable>();
for (int variableIndex = 0; variableIndex < methodVariableNames.Length; variableIndex++) {
@@ -338,7 +334,6 @@ namespace Advanced_Software_Engineering {
tmpVerb = currentChunk;
currentChunk = verbChunks[chunkDepth];
rootValueStorage.DecreaseStack();
} else throw new Exception(command + " doesn't take parameters");
break;