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

ProcessLine if else, inline exist checks

Browse Source 
ProcessLine now does checks with if else statements, which should hopefully improve performance, and exist checks are inline if statements, so a new variable doesn't need to be initialized for a single use.
This commit is contained in:
sam-astro 2022-01-05 09:17:03 -05:00 committed by GitHub
parent 4fb5500cc3
commit c705771eaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Slang/Main.cpp
View File

@ -115,12 +115,10 @@ any GetVariableValue(const string varName, const unordered_map<string, any>& var
bool IsVar(const string varName, const unordered_map<string, any>& variableVals) bool IsVar(const string varName, const unordered_map<string, any>& variableVals)
{ {
auto iA = variableVals.find(varName); if (variableVals.find(varName) != variableVals.end())
if (iA != variableVals.end())
{
return true; return true;
} else
return false; return false;
} }
vector<any> VarValues(const vector<string> varNames, const unordered_map<string, any>& variableVals) vector<any> VarValues(const vector<string> varNames, const unordered_map<string, any>& variableVals)
@ -155,15 +153,10 @@ vector<any> VarValues(const vector<string> varNames, const unordered_map<string,
bool IsFunction(const string funcName) bool IsFunction(const string funcName)
{ {
auto iA = functionValues.find(funcName); if (functionValues.find(funcName) != functionValues.end())
if (iA != functionValues.end())
{
return true; return true;
}
else else
{
return false; return false;
}
} }
any EvalExpression(const string ex, const unordered_map<string, any>& variableVals) any EvalExpression(const string ex, const unordered_map<string, any>& variableVals)
@ -366,23 +359,22 @@ any ProcessLine(const vector<vector<string>>& words, const int lineNum, unordere
return; return;
// If print statement (deprecated, now use CPP.System.Print() function) // If print statement (deprecated, now use CPP.System.Print() function)
if (words[lineNum][0] == "print") else if (words[lineNum][0] == "print")
{ {
cout << AnyAsString(EvalExpression(unWrapVec(vector<string>(words[lineNum].begin() + 1, words[lineNum].end())), variableValues)) << endl; cout << AnyAsString(EvalExpression(unWrapVec(vector<string>(words[lineNum].begin() + 1, words[lineNum].end())), variableValues)) << endl;
return; return;
} }
// Check if function return // Check if function return
if (words[lineNum][0] == "return") else if (words[lineNum][0] == "return")
return EvalExpression(unWrapVec(vector<string>(words[lineNum].begin() + 1, words[lineNum].end())), variableValues); return EvalExpression(unWrapVec(vector<string>(words[lineNum].begin() + 1, words[lineNum].end())), variableValues);
// Check if it is CPP Builtin function // Check if it is CPP Builtin function
if (words[lineNum][0][0] == 'C' && words[lineNum][0][1] == 'P' && words[lineNum][0][2] == 'P' && words[lineNum][0][3] == '.') else if (words[lineNum][0][0] == 'C' && words[lineNum][0][1] == 'P' && words[lineNum][0][2] == 'P' && words[lineNum][0][3] == '.')
return EvalExpression(unWrapVec(words[lineNum]), variableValues); return EvalExpression(unWrapVec(words[lineNum]), variableValues);
// Check if it is function // Check if it is function
auto iA = functionValues.find(trim(split(words[lineNum][0], '(')[0])); else if (IsFunction(trim(split(words[lineNum][0], '(')[0])))
if (iA != functionValues.end())
{ {
ExecuteFunction(trim(split(words[lineNum][0], '(')[0]), VarValues(split(RMParenthesis(replace(unWrapVec(words[lineNum]), trim(split(words[lineNum][0], '(')[0]), "")), ','), variableValues)); ExecuteFunction(trim(split(words[lineNum][0], '(')[0]), VarValues(split(RMParenthesis(replace(unWrapVec(words[lineNum]), trim(split(words[lineNum][0], '(')[0]), "")), ','), variableValues));
return; return;
@ -390,26 +382,23 @@ any ProcessLine(const vector<vector<string>>& words, const int lineNum, unordere
// Iterate through all types to see if line inits or // Iterate through all types to see if line inits or
// re-inits a variable then store it with it's value // re-inits a variable then store it with it's value
for (int t = 0; t < (int)types.size(); t++) else if (countInVector(types, words[lineNum][0]) > 0)
{ {
if (words[lineNum][0] == types[t]) variableValues[words[lineNum][1]] = EvalExpression(unWrapVec(vector<string>(words[lineNum].begin() + 3, words[lineNum].end())), variableValues);
{ return;
variableValues[words[lineNum][1]] = EvalExpression(unWrapVec(vector<string>(words[lineNum].begin() + 3, words[lineNum].end())), variableValues);
return;
}
} }
// Check existing variables // Check existing variables: If matches, then it means
auto iB = variableValues.find(words[lineNum][0]); // the variables value is getting changed with an operator
if (iB != variableValues.end()) else if (IsVar(words[lineNum][0], variableValues))
{ {
// Evaluates what the sign (ex. '=', '+=') does to the value on the left by the value on the right // Evaluates what the operator (ex. '=', '+=') does to the value on the left by the value on the right
evalEqu(vector<string>(words[lineNum].begin(), words[lineNum].end()), variableValues); evalEqu(vector<string>(words[lineNum].begin(), words[lineNum].end()), variableValues);
return; return;
} }
// Gathers while loop contents // Gathers while loop contents
if (words[lineNum][0] == "while") else if (words[lineNum][0] == "while")
{ {
vector<string> whileContents; vector<string> whileContents;
vector<string> whileParameters; vector<string> whileParameters;
@ -447,8 +436,9 @@ any ProcessLine(const vector<vector<string>>& words, const int lineNum, unordere
} }
return; return;
} }
// Gathers if statement contents // Gathers if statement contents
if (words[lineNum][0] == "if") else if (words[lineNum][0] == "if")
{ {
vector<string> ifContents; vector<string> ifContents;
vector<string> ifParameters; vector<string> ifParameters;