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

Added function call functionality at one point, also worked on args and started on 'equation' functionaliy, allowing for multiple operations in the same line and parenthesis, like: int g = (y - 4) + ((x + b) / 4)

Browse Source
This commit is contained in:
sam-astro 2021-12-25 17:04:25 -05:00
parent ce87bdbe81
commit 41d4b11ed1
4 changed files with 73 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Slang/Main.cpp
View File

@ -44,7 +44,7 @@ int ExecuteFunction(string functionName, vector<string> inputVarVals);
bool isNumber(const string& str)
{
for (char const& c : str) {
if (isdigit(c) == 0 && c!='.') return false;
if (isdigit(c) == 0 && c != '.') return false;
}
return true;
}
@ -103,7 +103,7 @@ int countNoOverlap(string str, char ch1, char ch2) {
}
int indexInStr(string str, char ch) {
for (int i = 0; i < (int)str.size(); i++)
if (str[i] == ch)
return i;
@ -112,7 +112,7 @@ int indexInStr(string str, char ch) {
}
int charIndexInVec(vector<string> str, char ch) {
for (int i = 0; i < (int)str.size(); i++)
for (int w = 0; w < (int)str[i].size(); w++)
if (str[i][w] == ch)
@ -159,7 +159,7 @@ vector<string> removeTabs(vector<string> str, int amnt) {
vector<string> rangeInVec(vector<string> str, int min, int max) {
if (max == -1)
max == (int)str.size();
max = (int)str.size();
vector<string> newStr;
@ -171,7 +171,7 @@ vector<string> rangeInVec(vector<string> str, int min, int max) {
string rangeInStr(string str, int min, int max) {
if (max == -1)
max == (int)str.size();
max = (int)str.size();
string newStr;
@ -260,7 +260,7 @@ string GetRealValue(string var, vector<string>& variables, vector<string>& varia
else if (!isNumber(var) && count(var, '\"') > 0)
{
string withoutQuotes;
for (int ch = 1; ch < (int)var.size()-1; ch++)
for (int ch = 1; ch < (int)var.size() - 1; ch++)
{
withoutQuotes += var[ch];
}
@ -296,7 +296,51 @@ bool BooleanLogic(string valA, string determinant, string valB, vector<string>&
return false;
}
string PEMDAS(string equ)
string evalEqu(vector<string> str, vector<string>& variables, vector<string>& variableValues)
{
// Second, iterate all existing local variable names
for (int v = 0; v < (int)variables.size(); v++)
{
if (str[0] == variables[v])
{
if (str[1] == "=")
variableValues[v] = str[2];
else if (str[1] == "+=")
variableValues[v] = AddItem(variableValues[v], GetRealValue(str[2], variables, variableValues));
else if (str[1] == "-=")
variableValues[v] = to_string(stof(variableValues[v]) - stof(GetRealValue(str[2], variables, variableValues)));
else if (str[1] == "*=")
variableValues[v] = to_string(stof(variableValues[v]) * stof(GetRealValue(str[2], variables, variableValues)));
else if (str[1] == "/=")
variableValues[v] = to_string(stof(variableValues[v]) / stof(GetRealValue(str[2], variables, variableValues)));
//cout << words[l][1] << " is " << words[l][3] << endl << endl;
return 0;
}
}
// Third, iterate all existing global variable names
for (int v = 0; v < (int)globalVariables.size(); v++)
{
if (str[0] == globalVariables[v])
{
if (str[1] == "=")
globalVariableValues[v] = str[2];
else if (str[1] == "+=")
globalVariableValues[v] = AddItem(globalVariableValues[v], GetRealValue(str[2], variables, variableValues));
else if (str[1] == "-=")
globalVariableValues[v] = to_string(stof(globalVariableValues[v]) - stof(GetRealValue(str[2], variables, variableValues)));
else if (str[1] == "*=")
globalVariableValues[v] = to_string(stof(globalVariableValues[v]) * stof(GetRealValue(str[2], variables, variableValues)));
else if (str[1] == "/=")
globalVariableValues[v] = to_string(stof(globalVariableValues[v]) / stof(GetRealValue(str[2], variables, variableValues)));
//cout << words[l][1] << " is " << words[l][3] << endl << endl;
return 0;
}
}
}
string PEMDAS(string equ, vector<string>& variables, vector<string>& variableValues)
{
if (split(equ, ',').size() == 1)
return equ;
@ -324,7 +368,7 @@ string PEMDAS(string equ)
}
}
equ = replace(equ, "(" + unWrapVec(insideParenthesis) + ")", PEMDAS(unWrapVec(insideParenthesis)));
equ = replace(equ, "(" + unWrapVec(insideParenthesis) + ")", PEMDAS(unWrapVec(insideParenthesis), variables, variableValues));
}
}
@ -478,6 +522,8 @@ int ProcessLine(vector<vector<string>> words, int l, vector<string>& variables,
int ExecuteFunction(string functionName, vector<string> inputVarVals)
{
//vector<string> inputVarVals = split(replace(inVals, " ", ""), ',');
vector<string> functionLines;
int functionIndex = 0;
//Get index of function
@ -494,7 +540,7 @@ int ExecuteFunction(string functionName, vector<string> inputVarVals)
vector<string> functionNameParts = split(functions[functionIndex], ' ');
for (int i = 1; i < (int)functionNameParts.size(); i++)
{
variables.push_back(functionNameParts[i]);
variables.push_back(replace(replace(functionNameParts[i], ",", ""), " ", ""));
variableValues.push_back(inputVarVals[i - 1]);
}
vector<vector<string>> words;

1
Slang/Slang.vcxproj
View File

@ -141,7 +141,6 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Main.cpp" />
<ClCompile Include="processLine.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="olcPixelGameEngine.h" />

3
Slang/Slang.vcxproj.filters
View File

@ -18,9 +18,6 @@
<ClCompile Include="Main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="processLine.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="olcPixelGameEngine.h">

39
Slang/script.sl
View File

@ -1,34 +1,31 @@
int x = 1
void Next(in, sin)
{
string green = "bean"
green += " "
green += in
print in
print sin
print green
}
void Main(input)
{
int a = 8
int a = -8
int b = 4
print input
int k = 0
while x < 1000
{
a /= 7.2
a += 9.12867
int xThou = x
xThou /= 10000
a *= xThou
x += 1
if x > 0
{
print a
}
print x
}
Next "seen"
Next "seen" "bop"
}
void Next()
{
string green = "bean"
print green
}
Main hi
Main "hi"