wucket/Z-Sharp
1
0
Fork 0
mirror of https://github.com/sam-astro/Z-Sharp.git synced 2025-12-13 09:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow for escaped quotes, start allowing for semicolon line endings

Browse Source
This commit is contained in:
sam-astro 2022-05-18 10:46:36 -04:00 committed by GitHub
parent fe371716c9
commit 7d1620e433
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ZSharp/Main.cpp
View File

@ -172,7 +172,7 @@ boost::any EvalExpression(const string& ex, unordered_map<string, boost::any>& v
for (int i = 0; i < expression.size(); i++) for (int i = 0; i < expression.size(); i++)
{ {
if (expression[i] == '\"') if (expression[i] == '\"' && expression[i-1] != '\\')
inQuotes = !inQuotes; inQuotes = !inQuotes;
if (isalpha(expression[i])) if (isalpha(expression[i]))
@ -235,7 +235,7 @@ boost::any EvalExpression(const string& ex, unordered_map<string, boost::any>& v
bool addStrings = false; bool addStrings = false;
for (int i = 0; i < (int)newExpression.size(); i++) for (int i = 0; i < (int)newExpression.size(); i++)
if (isalpha(newExpression[i]) || newExpression[i] == '\"') if (isalpha(newExpression[i]) || (newExpression[i] == '\"' && expression[i-1] != '\\'))
{ {
addStrings = true; addStrings = true;
break; break;
@ -246,7 +246,7 @@ boost::any EvalExpression(const string& ex, unordered_map<string, boost::any>& v
string withoutParenthesis = ""; string withoutParenthesis = "";
for (int i = 0; i < (int)newExpression.size(); i++) for (int i = 0; i < (int)newExpression.size(); i++)
{ {
if (newExpression[i] == '\"') if (newExpression[i] == '\"' && expression[i-1] != '\\')
{ {
inQuotes = !inQuotes; inQuotes = !inQuotes;
continue; continue;
@ -571,7 +571,6 @@ boost::any ExecuteFunction(const string& functionName, const vector<boost::any>&
} }
catch (const std::exception&) catch (const std::exception&)
{ {
LogCriticalError("\'" + unWrapVec(words.at(lineNum)) + "\'\n In function: " + functionName + "\n Line: " + to_string(lineNum));
} }
} }
return nullType; return nullType;
@ -584,7 +583,7 @@ int parseZSharp(string script)
InterpreterLog("Contents:\n" + script); InterpreterLog("Contents:\n" + script);
#endif #endif
vector<string> lines = split(script, '\n'); vector<string> lines = split(script, ';');
vector<vector<string>> words; vector<vector<string>> words;
for (int i = 0; i < (int)lines.size(); i++) for (int i = 0; i < (int)lines.size(); i++)
words.push_back(split(lines.at(i), ' ')); words.push_back(split(lines.at(i), ' '));