From 29f4ad704ffd1583c3c701e6780702f9587f563f Mon Sep 17 00:00:00 2001
From: sam-astro <77079540+sam-astro@users.noreply.github.com>
Date: Sat, 1 Jan 2022 23:46:31 -0500
Subject: [PATCH] Update Main.cpp

---
 Slang/Main.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Slang/Main.cpp b/Slang/Main.cpp
index 810eff1..b35c728 100644
--- a/Slang/Main.cpp
+++ b/Slang/Main.cpp
@@ -73,6 +73,11 @@ string StringRaw(string str)
 	return withoutQuotes;
 }
 
+string Quoted(string str)
+{
+	return "\"" + str + "\"";
+}
+
 string GetVariableValue(string varName, vector<string>& variables, vector<string>& variableVals)
 {
 	string typ = "string";
@@ -127,7 +132,8 @@ string EvalExpression(string expression, vector<string>& variables, vector<strin
 	expression = trim(expression);
 	cout << "EXPRESSION: " << expression << endl;
 
-	if (count(expression, '+') == 0 && count(expression, '-') == 0 && count(expression, '*') == 0 && count(expression, '/') == 0)
+	// If no operations are applied, then return self
+	if (count(expression, '+') == 0 && count(expression, '-') == 0 && count(expression, '*') == 0 && count(expression, '/') == 0 && count(expression, '(') == 0 && count(expression, '^') == 0)
 		return GetVariableValue(expression, variables, variableVals);
 
 	string newExpression = "";
@@ -166,7 +172,6 @@ string EvalExpression(string expression, vector<string>& variables, vector<strin
 		}
 	if (addStrings)
 	{
-		string newStr = "";
 		inQuotes = false;
 		string withoutParenthesis = "";
 		for (int i = 0; i < (int)newExpression.size(); i++)
@@ -182,8 +187,8 @@ string EvalExpression(string expression, vector<string>& variables, vector<strin
 				withoutParenthesis += newExpression[i];
 		}
 
-		cout << "NewSTRING = " << withoutParenthesis << endl;
-		return withoutParenthesis;
+		cout << "NewSTRING = " << Quoted(withoutParenthesis) << endl;
+		return Quoted(withoutParenthesis);
 	}
 	else
 		return to_string(evaluate(newExpression));
@@ -514,4 +519,4 @@ int main(int argc, char* argv[])
 		return 1;
 	}*/
 	return 0;
-}
\ No newline at end of file
+}