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

Made it possible to instantly convert parameters to expressions

Browse Source 
So things like circle 100 + i are possible now
This commit is contained in:
Lukasz Baldyga committed 2020-11-30 10:19:24 +00:00
1 parent 1d9fed93a1
commit 351bf3f1fb
3 files changed
+45 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/UpdateVariable.cs
+1 -25
View File
@@ -20,31 +20,7 @@ namespace Advanced_Software_Engineering.Verbs.Value {
public UpdateVariable(ValueStorage storage, string name, string value) {
// incoming values look something like this "= 10"
// or "= 10 + i"
//seperate assignment characters from everything else
foreach (string op in new string[] { "=", "+", "-", "*", "/" }) {
value = value.Replace(op, " " + op + " ");
}
value = HelperFunctions.Strip(value);
if (value[0] == "="[0]) {
value = value.Substring(1);
}
// now will definitly look like this:
// 10 + i or i
string[] assignmentStrings = HelperFunctions.StripStringArray(value.Split(" "[0])).ToArray();
// assignmentStrings will look something like this:
// ["i"] or ["10", "+", "i"]
if (assignmentStrings.Length == 1) Init(storage, name, ValueFactory.CreateValue(storage, assignmentStrings[0]));
else if (assignmentStrings.Length == 3) {
// assignmentStrings looks like this => ["10", "+", "i"]
IValue value1 = ValueFactory.CreateValue(storage, assignmentStrings[0]);
string op = assignmentStrings[1];
IValue value2 = ValueFactory.CreateValue(storage, assignmentStrings[2]);
Init(storage, name, new ExpressionValue(value1, value2, op));
}
Init(storage, name, ValueHelper.ConvertToIValue(value, storage));
}
public void ExecuteVerb() {
Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueFactory.cs
+3 -3
View File
@@ -60,10 +60,10 @@ namespace Advanced_Software_Engineering.Verbs.Value {
}
}
public static IValue CreateValue(ValueStorage drawer, string value) {
public static IValue CreateValue(ValueStorage storage, string value) {
value = HelperFunctions.Strip(value);
if (drawer.CheckVariableExists(value)) return new VariableValue(drawer, value);
else return ValueHelper.ConvertToIValue(value);
if (storage.CheckVariableExists(value)) return new VariableValue(storage, value);
else return ValueHelper.ConvertToIValue(value, storage);
}
public static IValue CreateValue(bool b) {
Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueHelper.cs
+41 -3
View File
@@ -120,7 +120,7 @@ namespace Advanced_Software_Engineering.Verbs.Value {
}
}
public static IValue ConvertToIValue(string text) {
public static IValue ConvertToIValue(string text, ValueStorage storage = null) {
text = HelperFunctions.Strip(text);
//No assignmnet
if (!text.Contains("=")) {
@@ -136,6 +136,37 @@ namespace Advanced_Software_Engineering.Verbs.Value {
try {
return ValueFactory.CreateValue(text, "double");
} catch (Exception) { }
//check for expression
if (storage != null)
try {
string value = text;
//seperate assignment characters from everything else
foreach (string op in new string[] { "=", "+", "-", "*", "/" }) {
value = value.Replace(op, " " + op + " ");
}
value = HelperFunctions.Strip(value);
if (value[0] == "="[0]) {
value = value.Substring(1);
}
// now will definitly look like this:
// 10 + i or i
string[] assignmentStrings = HelperFunctions.StripStringArray(value.Split(" "[0])).ToArray();
// assignmentStrings will look something like this:
// ["i"] or ["10", "+", "i"]
if (assignmentStrings.Length == 1) return ValueFactory.CreateValue(storage, assignmentStrings[0]);
else if (assignmentStrings.Length == 3) {
// assignmentStrings looks like this => ["10", "+", "i"]
IValue value1 = ValueFactory.CreateValue(storage, assignmentStrings[0]);
string op = assignmentStrings[1];
IValue value2 = ValueFactory.CreateValue(storage, assignmentStrings[2]);
return new ExpressionValue(value1, value2, op);
}
} catch (Exception) { }
}
//Check if color
@@ -145,8 +176,15 @@ namespace Advanced_Software_Engineering.Verbs.Value {
} else {
//Check if string is a bool TODO
//Check if string is an expression
return ValueFactory.CreateValue(text, "expression");
//Check if expression
if (storage != null) {
string value = text;
value = HelperFunctions.Strip(value);
if (value[0] == "="[0]) {
value = value.Substring(1);
}
return ConvertToIValue(value, storage);
}
}
throw new Exception("Could not convert " + text + " to any type");
}