wucket/Z-Sharp
1
0
Fork 0
mirror of https://github.com/sam-astro/Z-Sharp.git synced 2026-02-04 07:02:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Much better function ARG parsing, allowing other functions as ARGs

Browse Source
This commit is contained in:
sam-astro 2022-05-24 16:10:39 -04:00
parent 19073fcc7c
commit 3c684f2153
2 changed files with 61 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
ZSharp/Main.cpp
View File

@ -143,34 +143,33 @@ boost::any EvalExpression(const string& ex, unordered_map<string, boost::any>& v
//bool isFunc = IsFunction(split(expression, '(')[0]); //bool isFunc = IsFunction(split(expression, '(')[0]);
if (isFunc && !inQuotes) if (isFunc && !inQuotes)
{ {
//cout << split(expression, '(')[0] << endl;
//string argContents = "";
//int y = indexInStr(expression, '(') + 1;
//while (y < expression.size() && expression[y] != ')')
//{
// argContents += expression[y];
// y++;
//}
//return ExecuteFunction(split(expression, '(')[0], VarValues(split(argContents, ','), variableValues));
// start -> FuncCall(0, x, OtherFunc(a)) // start -> FuncCall(0, x, OtherFunc(a))
// changeto -> 0, x, OtherFunc(a) // changeto -> 0, x, OtherFunc(a)
string insideFunArgs = betweenChars(expression, '(', ')'); string insideFunArgs = betweenChars(expression, '(', ')');
#if DEVELOPER_MESSAGES == true
cout << insideFunArgs << endl;
#endif
vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')'); vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')');
#if DEVELOPER_MESSAGES == true
cout << "["<<unWrapVec(argList) <<"]" << endl;
#endif
vector<boost::any> funcArgs = VarValues(argList, variableValues); vector<boost::any> funcArgs = VarValues(argList, variableValues);
return ExecuteFunction(trim(split(expression, '(')[0]), funcArgs); return ExecuteFunction(trim(split(expression, '(')[0]), funcArgs);
} }
else if (isZS && !inQuotes) else if (isZS && !inQuotes)
{ {
string argContents = ""; // start -> FuncCall(0, x, OtherFunc(a))
int y = indexInStr(expression, '(') + 1; // changeto -> 0, x, OtherFunc(a)
while (y < expression.size() && expression[y] != ')') string insideFunArgs = betweenChars(expression, '(', ')');
{ #if DEVELOPER_MESSAGES == true
argContents += expression[y]; cout << insideFunArgs << endl;
#endif
y++; vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')');
} #if DEVELOPER_MESSAGES == true
return ZSFunction(split(expression, '(')[0], VarValues(split(argContents, ','), variableValues)); cout << "[" << unWrapVec(argList) << "]" << endl;
#endif
vector<boost::any> funcArgs = VarValues(argList, variableValues);
return ZSFunction(trim(split(expression, '(')[0]), funcArgs);
} }
else else
return GetVariableValue(expression, variableValues); return GetVariableValue(expression, variableValues);
@ -198,38 +197,34 @@ boost::any EvalExpression(const string& ex, unordered_map<string, boost::any>& v
bool isFunc = IsFunction(name); bool isFunc = IsFunction(name);
if (isFunc && !inQuotes) if (isFunc && !inQuotes)
{ {
//string argContents = "";
//i++;
//while (i < expression.size() && expression[i] != ')')
//{
// argContents += expression[i];
// i++;
//}
//string returnVal = AnyAsString(ExecuteFunction(name, VarValues(split(argContents, ','), variableValues)));
//newExpression += returnVal;
// start -> FuncCall(0, x, OtherFunc(a)) // start -> FuncCall(0, x, OtherFunc(a))
// changeto -> 0, x, OtherFunc(a) // changeto -> 0, x, OtherFunc(a)
string insideFunArgs = betweenChars(expression, '(', ')'); string insideFunArgs = betweenChars(expression, '(', ')');
#if DEVELOPER_MESSAGES == true
cout << insideFunArgs << endl;
#endif
vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')'); vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')');
#if DEVELOPER_MESSAGES == true
cout << unWrapVec(argList) << endl;
#endif
vector<boost::any> funcArgs = VarValues(argList, variableValues); vector<boost::any> funcArgs = VarValues(argList, variableValues);
string returnVal = AnyAsString(ExecuteFunction(trim(split(expression, '(')[0]), funcArgs)); string returnVal = AnyAsString(ExecuteFunction(trim(split(expression, '(')[0]), funcArgs));
newExpression += returnVal; newExpression += returnVal;
} }
else if (split(name, '.')[0] == "ZS" && !inQuotes) else if (split(name, '.')[0] == "ZS" && !inQuotes)
{ {
string argContents = ""; // start -> FuncCall(0, x, OtherFunc(a))
int y = indexInStr(expression, '(') + 1; // changeto -> 0, x, OtherFunc(a)
while (y < expression.size() && expression[y] != ')') string insideFunArgs = betweenChars(expression, '(', ')');
{ #if DEVELOPER_MESSAGES == true
argContents += expression[y]; cout << insideFunArgs << endl;
#endif
y++; vector<string> argList = splitNoOverlap(insideFunArgs, ',', '(', ')');
} #if DEVELOPER_MESSAGES == true
//cout << split(expression, '(')[0] << " " << argContents << endl; cout << unWrapVec(argList) << endl;
string returnVal = AnyAsString(ZSFunction(split(name, '(')[0], VarValues(split(argContents, ','), variableValues))); #endif
vector<boost::any> funcArgs = VarValues(argList, variableValues);
string returnVal = AnyAsString(ExecuteFunction(trim(split(expression, '(')[0]), funcArgs));
newExpression += returnVal; newExpression += returnVal;
} }
else else
@ -245,8 +240,8 @@ boost::any EvalExpression(const string& ex, unordered_map<string, boost::any>& v
else else
{ {
newExpression += expression[i]; newExpression += expression[i];
}
} }
}
#if DEVELOPER_MESSAGES == true #if DEVELOPER_MESSAGES == true
//InterpreterLog(" new expression: |" + newExpression + "|"); //InterpreterLog(" new expression: |" + newExpression + "|");
#endif #endif
@ -546,7 +541,7 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
ifContents.push_back(words.at(lineNum)); ifContents.push_back(words.at(lineNum));
lineNum++; lineNum++;
} }
ifContents = removeTabsWdArry(ifContents, 1); ifContents = removeTabsWdArry(ifContents, 1);
if (BooleanLogic(ifParameters.at(0), ifParameters.at(1), ifParameters.at(2), variableValues)) if (BooleanLogic(ifParameters.at(0), ifParameters.at(1), ifParameters.at(2), variableValues))
@ -565,7 +560,7 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
{ {
vector<vector<string>> elseContents; vector<vector<string>> elseContents;
vector<string> elseParameters; vector<string> elseParameters;
int numOfBrackets = 0; int numOfBrackets = 0;
for (int w = 1; w < (int)words.at(lineNum).size(); w++) { for (int w = 1; w < (int)words.at(lineNum).size(); w++) {
if (count(words.at(lineNum).at(w), '{') != 0) if (count(words.at(lineNum).at(w), '{') != 0)
@ -574,7 +569,7 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
break; break;
} }
} }
lineNum++; lineNum++;
while (lineNum < (int)words.size()) while (lineNum < (int)words.size())
{ {
@ -584,9 +579,9 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
elseContents.push_back(words.at(lineNum)); elseContents.push_back(words.at(lineNum));
lineNum++; lineNum++;
} }
elseContents = removeTabsWdArry(elseContents, 1); elseContents = removeTabsWdArry(elseContents, 1);
//Iterate through all lines in if statement //Iterate through all lines in if statement
for (int l = 0; l < (int)elseContents.size(); l++) for (int l = 0; l < (int)elseContents.size(); l++)
{ {
@ -594,7 +589,7 @@ boost::any ProcessLine(const vector<vector<string>>& words, int& lineNum, unorde
if (!returnVal.empty()) if (!returnVal.empty())
return returnVal; return returnVal;
} }
} }
} }
return nullType; return nullType;
@ -626,7 +621,7 @@ boost::any ExecuteFunction(const string& functionName, const vector<boost::any>&
cout << functionName + " \x1B[33m" << funcArgs[i] << " == " << AnyAsString(inputVarVals[i]) << "\033[0m\t\t" << endl; cout << functionName + " \x1B[33m" << funcArgs[i] << " == " << AnyAsString(inputVarVals[i]) << "\033[0m\t\t" << endl;
#endif #endif
} }
} }
//Iterate through all lines in function //Iterate through all lines in function
for (int lineNum = 1; lineNum < (int)words.size(); lineNum++) for (int lineNum = 1; lineNum < (int)words.size(); lineNum++)
@ -701,7 +696,7 @@ int parseZSharp(string script)
functionContents.push_back(removeTabs(words.at(p), 1)); functionContents.push_back(removeTabs(words.at(p), 1));
} }
functionValues[functName] = functionContents; functionValues[functName] = functionContents;
} }
else else
{ {
if (words.at(lineNum).at(0) == "include") if (words.at(lineNum).at(0) == "include")
@ -760,8 +755,8 @@ int parseZSharp(string script)
} }
/*else /*else
LogWarning("unrecognized type \'" + words.at(lineNum).at(0) + "\' on line: " + to_string(lineNum));*/ LogWarning("unrecognized type \'" + words.at(lineNum).at(0) + "\' on line: " + to_string(lineNum));*/
} }
} }
return 0; return 0;
} }
@ -790,7 +785,7 @@ int main(int argc, char* argv[])
#if DEVELOPER_MESSAGES #if DEVELOPER_MESSAGES
cout << scriptPath << endl; cout << scriptPath << endl;
#endif #endif
if (!fileExists(scriptPath) if (!fileExists(scriptPath))
LogCriticalError("Failed to load script from path: \"" + scriptPath + "\""); LogCriticalError("Failed to load script from path: \"" + scriptPath + "\"");
std::string projectDirectory = scriptPath.substr(0, scriptPath.find_last_of("/\\")); std::string projectDirectory = scriptPath.substr(0, scriptPath.find_last_of("/\\"));
@ -806,7 +801,7 @@ int main(int argc, char* argv[])
// Change the current working directory to that of the script // Change the current working directory to that of the script
int chErr = chdir(projectDirectory.c_str()); int chErr = chdir(projectDirectory.c_str());
if(chErr < 0) if (chErr < 0)
LogCriticalError("Failed to change directory to: \"" + projectDirectory.c_str() + "\", error num: " + chErr); LogCriticalError("Failed to change directory to: \"" + projectDirectory.c_str() + "\", error num: " + chErr);
#if DEVELOPER_MESSAGES #if DEVELOPER_MESSAGES
InterpreterLog("Changed directory to " + projectDirectory + "..."); InterpreterLog("Changed directory to " + projectDirectory + "...");

14
ZSharp/strops.cpp
View File

@ -159,16 +159,26 @@ vector<string> splitNoOverlap(const string& str, const char& splitBy, const char
string tmpStr = ""; string tmpStr = "";
for (int i = 0; i < (int)str.size(); i++) for (int i = 0; i < (int)str.size(); i++)
{ {
if (i == (int)str.size() - 1)
{
newStr.push_back(tmpStr+ str[i]);
break;
}
if (str[i] == splitBy && openCount == 0) if (str[i] == splitBy && openCount == 0)
{ {
newStr.push_back(tmpStr); newStr.push_back(tmpStr);
tmpStr = ""; tmpStr = "";
continue; continue;
} }
else if (str[i] == openChar) else if (str[i] == openChar) {
tmpStr += str[i];
openCount += 1; openCount += 1;
else if (str[i] == closeChar) }
else if (str[i] == closeChar) {
tmpStr += str[i];
openCount -= 1; openCount -= 1;
}
else else
tmpStr += str[i]; tmpStr += str[i];
} }