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

added better functions and stuf

Browse Source
This commit is contained in:
sam-astro 2021-12-29 17:13:04 -05:00
parent 41d4b11ed1
commit e7d8f31851
2 changed files with 164 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

243
Slang/Main.cpp
View File

@ -4,6 +4,8 @@
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <regex> #include <regex>
#include <limits>
#include <algorithm>
using namespace std; using namespace std;
@ -49,6 +51,24 @@ bool isNumber(const string& str)
return true; return true;
} }
const string WHITESPACE = " \n\r\t\f\v";
string ltrim(const string& s)
{
size_t start = s.find_first_not_of(WHITESPACE);
return (start == string::npos) ? "" : s.substr(start);
}
string rtrim(const string& s)
{
size_t end = s.find_last_not_of(WHITESPACE);
return (end == string::npos) ? "" : s.substr(0, end + 1);
}
string trim(const string& s) {
return rtrim(ltrim(s));
}
vector<string> split(string str, char del) { vector<string> split(string str, char del) {
// declaring temp string to store the curr "word" upto del // declaring temp string to store the curr "word" upto del
string temp = ""; string temp = "";
@ -194,6 +214,22 @@ string unWrapVec(vector<string> vec) {
return newStr; return newStr;
} }
float floatval(string s)
{
float outfloat;
if (s == "inf")
outfloat = numeric_limits<float>::max();
else if (s == "-inf")
outfloat = -numeric_limits<float>::max();
else if (s == "")
outfloat = 0;
else
outfloat = stof(s);
return outfloat;
}
string replace(string str, string strToReplace, string replaceWith) { string replace(string str, string strToReplace, string replaceWith) {
string newStr; string newStr;
string savedLetters;; string savedLetters;;
@ -228,11 +264,13 @@ string replace(string str, string strToReplace, string replaceWith) {
return newStr; return newStr;
} }
string AddItem(string variableContent, string addItem) string AddItem(string varName, string variableContent, string addItem)
{ {
if (isNumber(variableContent)) string typ = split(varName, ' ')[0];
if (typ == "int" || typ == "float" || typ == "double" && isNumber(addItem))
{ {
return to_string(stof(variableContent) + stof(addItem)); return to_string(floatval(to_string(floatval(variableContent) + floatval(addItem))));
} }
else else
{ {
@ -240,34 +278,75 @@ string AddItem(string variableContent, string addItem)
} }
} }
string GetRealValue(string var, vector<string>& variables, vector<string>& variableVals) string GetRealValue(string varName, vector<string>& variables, vector<string>& variableVals)
{ {
if (!isNumber(var) && count(var, '\"') == 0) string typ = "string";
bool isVar = false;
// Checks against global vars
for (int v = 0; v < (int)globalVariables.size(); v++)
if (varName == split(globalVariables[v], ' ')[1])
{
typ = split(globalVariables[v], ' ')[0];
isVar = true;
}
// Checks against local vars
for (int v = 0; v < (int)variables.size(); v++)
if (varName == split(variables[v], ' ')[1])
{
typ = split(variables[v], ' ')[0];
isVar = true;
}
//if ((typ == "int" || typ == "float" || typ == "double") && isVar)
//{
// // Checks against global vars
// for (int v = 0; v < (int)globalVariables.size(); v++)
// if (varName == split(globalVariables[v], ' ')[1])
// {
// if (globalVariableValues[v] == "inf")
// globalVariableValues[v] = 2147483646;
// if (globalVariableValues[v] == "-inf")
// globalVariableValues[v] = -2147483646;
// }
// // Checks against local vars
// for (int v = 0; v < (int)variables.size(); v++)
// if (varName == split(variables[v], ' ')[1])
// {
// if (variableVals[v] == "inf")
// variableVals[v] = 2147483646;
// if (variableVals[v] == "-inf")
// variableVals[v] = -2147483646;
// }
//}
// If it is a var
if (isVar)
{ {
// Checks against global vars // Checks against global vars
for (int v = 0; v < (int)globalVariables.size(); v++) for (int v = 0; v < (int)globalVariables.size(); v++)
if (var == globalVariables[v]) if (varName == split(globalVariables[v], ' ')[1])
{ {
return globalVariableValues[v]; return globalVariableValues[v];
} }
// Checks against local vars // Checks against local vars
for (int v = 0; v < (int)variables.size(); v++) for (int v = 0; v < (int)variables.size(); v++)
if (var == variables[v]) if (varName == split(variables[v], ' ')[1])
{ {
return variableVals[v]; return variableVals[v];
} }
} }
else if (!isNumber(var) && count(var, '\"') > 0) else if (!isVar && count(varName, '\"') > 0)
{ {
string withoutQuotes; string withoutQuotes;
for (int ch = 1; ch < (int)var.size() - 1; ch++) for (int ch = 1; ch < (int)varName.size() - 1; ch++)
{ {
withoutQuotes += var[ch]; withoutQuotes += varName[ch];
} }
return withoutQuotes; return withoutQuotes;
} }
return var; return varName;
} }
bool BooleanLogic(string valA, string determinant, string valB, vector<string>& variables, vector<string>& variableVals) bool BooleanLogic(string valA, string determinant, string valB, vector<string>& variables, vector<string>& variableVals)
@ -282,59 +361,59 @@ bool BooleanLogic(string valA, string determinant, string valB, vector<string>&
return valARealValue != valBRealValue; return valARealValue != valBRealValue;
} }
if (determinant == ">=") { if (determinant == ">=") {
return stof(valARealValue) >= stof(valBRealValue); return floatval(valARealValue) >= floatval(valBRealValue);
} }
if (determinant == "<=") { if (determinant == "<=") {
return stof(valARealValue) <= stof(valBRealValue); return floatval(valARealValue) <= floatval(valBRealValue);
} }
if (determinant == ">") { if (determinant == ">") {
return stof(valARealValue) > stof(valBRealValue); return floatval(valARealValue) > floatval(valBRealValue);
} }
if (determinant == "<") { if (determinant == "<") {
return stof(valARealValue) < stof(valBRealValue); return floatval(valARealValue) < floatval(valBRealValue);
} }
return false; return false;
} }
string evalEqu(vector<string> str, vector<string>& variables, vector<string>& variableValues) int evalEqu(vector<string> str, vector<string>& variables, vector<string>& variableValues)
{ {
// Second, iterate all existing local variable names // Iterate all existing local variable names
for (int v = 0; v < (int)variables.size(); v++) for (int v = 0; v < (int)variables.size(); v++)
{ {
if (str[0] == variables[v]) if (str[0] == split(variables[v], ' ')[1])
{ {
if (str[1] == "=") if (str[1] == "=")
variableValues[v] = str[2]; variableValues[v] = GetRealValue(str[2], variables, variableValues);
else if (str[1] == "+=") else if (str[1] == "+=")
variableValues[v] = AddItem(variableValues[v], GetRealValue(str[2], variables, variableValues)); variableValues[v] = AddItem(variables[v], variableValues[v], GetRealValue(str[2], variables, variableValues));
else if (str[1] == "-=") else if (str[1] == "-=")
variableValues[v] = to_string(stof(variableValues[v]) - stof(GetRealValue(str[2], variables, variableValues))); variableValues[v] = to_string(floatval(variableValues[v]) - floatval(GetRealValue(str[2], variables, variableValues)));
else if (str[1] == "*=") else if (str[1] == "*=")
variableValues[v] = to_string(stof(variableValues[v]) * stof(GetRealValue(str[2], variables, variableValues))); variableValues[v] = to_string(floatval(variableValues[v]) * floatval(GetRealValue(str[2], variables, variableValues)));
else if (str[1] == "/=") else if (str[1] == "/=")
variableValues[v] = to_string(stof(variableValues[v]) / stof(GetRealValue(str[2], variables, variableValues))); variableValues[v] = to_string(floatval(variableValues[v]) / floatval(GetRealValue(str[2], variables, variableValues)));
//cout << words[l][1] << " is " << words[l][3] << endl << endl; //cout << words[lineNum][1] << " is " << words[lineNum][3] << endl << endl;
return 0; return 0;
} }
} }
// Third, iterate all existing global variable names // Iterate all existing global variable names
for (int v = 0; v < (int)globalVariables.size(); v++) for (int v = 0; v < (int)globalVariables.size(); v++)
{ {
if (str[0] == globalVariables[v]) if (str[0] == split(globalVariables[v], ' ')[1])
{ {
if (str[1] == "=") if (str[1] == "=")
globalVariableValues[v] = str[2]; globalVariableValues[v] = GetRealValue(str[2], variables, variableValues);
else if (str[1] == "+=") else if (str[1] == "+=")
globalVariableValues[v] = AddItem(globalVariableValues[v], GetRealValue(str[2], variables, variableValues)); globalVariableValues[v] = AddItem(variables[v], globalVariableValues[v], GetRealValue(str[2], variables, variableValues));
else if (str[1] == "-=") else if (str[1] == "-=")
globalVariableValues[v] = to_string(stof(globalVariableValues[v]) - stof(GetRealValue(str[2], variables, variableValues))); globalVariableValues[v] = to_string(floatval(globalVariableValues[v]) - floatval(GetRealValue(str[2], variables, variableValues)));
else if (str[1] == "*=") else if (str[1] == "*=")
globalVariableValues[v] = to_string(stof(globalVariableValues[v]) * stof(GetRealValue(str[2], variables, variableValues))); globalVariableValues[v] = to_string(floatval(globalVariableValues[v]) * floatval(GetRealValue(str[2], variables, variableValues)));
else if (str[1] == "/=") else if (str[1] == "/=")
globalVariableValues[v] = to_string(stof(globalVariableValues[v]) / stof(GetRealValue(str[2], variables, variableValues))); globalVariableValues[v] = to_string(floatval(globalVariableValues[v]) / floatval(GetRealValue(str[2], variables, variableValues)));
//cout << words[l][1] << " is " << words[l][3] << endl << endl; //cout << words[lineNum][1] << " is " << words[lineNum][3] << endl << endl;
return 0; return 0;
} }
} }
@ -372,19 +451,19 @@ string PEMDAS(string equ, vector<string>& variables, vector<string>& variableVal
} }
} }
int ProcessLine(vector<vector<string>> words, int l, vector<string>& variables, vector<string>& variableValues) int ProcessLine(vector<vector<string>> words, int lineNum, vector<string>& variables, vector<string>& variableValues)
{ {
if (words[l][0] == "print") { if (words[lineNum][0] == "print") {
cout << GetRealValue(words[l][1], variables, variableValues) << endl; cout << GetRealValue(words[lineNum][1], variables, variableValues) << endl;
return 0; return 0;
} }
// Iterate through all functions // Iterate through all functions
for (int t = 0; t < (int)functions.size(); t++) for (int t = 0; t < (int)functions.size(); t++)
{ {
if (words[l][0] == split(functions[t], ' ')[0]) if (words[lineNum][0] == split(functions[t], ' ')[0])
{ {
ExecuteFunction(words[l][0], rangeInVec(words[l], 1, -1)); ExecuteFunction(words[lineNum][0], split(unWrapVec(rangeInVec(words[lineNum], 1, -1)), ','));
return 0; return 0;
} }
} }
@ -393,66 +472,37 @@ int ProcessLine(vector<vector<string>> words, int l, vector<string>& variables,
// is a variable then store it with it's value // is a variable then store it with it's value
for (int t = 0; t < (int)types.size(); t++) for (int t = 0; t < (int)types.size(); t++)
{ {
if (words[l][0] == types[t]) if (words[lineNum][0] == types[t])
{ {
//Checks if it is variable //Checks if it is variable
variables.push_back(words[l][1]); variables.push_back(words[lineNum][0] + " " + words[lineNum][1]);
variableValues.push_back(GetRealValue((string)words[l][3], variables, variableValues)); variableValues.push_back(GetRealValue((string)words[lineNum][3], variables, variableValues));
//cout << words[l][1] << " is " << words[l][3] << endl << endl; cout << variables[(int)variables.size() - 1] << " is " << variableValues[(int)variableValues.size() -1] << endl;
return 0; return 0;
} }
} }
// Second, iterate all existing local variable names // Second, iterate all existing local variable names
for (int v = 0; v < (int)variables.size(); v++) for (int v = 0; v < (int)variables.size(); v++)
{ {
if (words[l][0] == variables[v]) if (words[lineNum][0] == split(variables[v], ' ')[1])
{ {
if (words[l][1] == "=") vector<string> inputs = { words[lineNum][0], words[lineNum][1], words[lineNum][2] };
variableValues[v] = words[l][2]; evalEqu(inputs, variables, variableValues);
else if (words[l][1] == "+=")
variableValues[v] = AddItem(variableValues[v], GetRealValue(words[l][2], variables, variableValues));
else if (words[l][1] == "-=")
variableValues[v] = to_string(stof(variableValues[v]) - stof(GetRealValue(words[l][2], variables, variableValues)));
else if (words[l][1] == "*=")
variableValues[v] = to_string(stof(variableValues[v]) * stof(GetRealValue(words[l][2], variables, variableValues)));
else if (words[l][1] == "/=")
variableValues[v] = to_string(stof(variableValues[v]) / stof(GetRealValue(words[l][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 (words[l][0] == globalVariables[v])
{
if (words[l][1] == "=")
globalVariableValues[v] = words[l][2];
else if (words[l][1] == "+=")
globalVariableValues[v] = AddItem(globalVariableValues[v], GetRealValue(words[l][2], variables, variableValues));
else if (words[l][1] == "-=")
globalVariableValues[v] = to_string(stof(globalVariableValues[v]) - stof(GetRealValue(words[l][2], variables, variableValues)));
else if (words[l][1] == "*=")
globalVariableValues[v] = to_string(stof(globalVariableValues[v]) * stof(GetRealValue(words[l][2], variables, variableValues)));
else if (words[l][1] == "/=")
globalVariableValues[v] = to_string(stof(globalVariableValues[v]) / stof(GetRealValue(words[l][2], variables, variableValues)));
//cout << words[l][1] << " is " << words[l][3] << endl << endl;
return 0; return 0;
} }
} }
// Gathers while loop contents // Gathers while loop contents
if (words[l][0] == "while") if (words[lineNum][0] == "while")
{ {
vector<string> whileContents; vector<string> whileContents;
vector<string> whileParameters; vector<string> whileParameters;
for (int w = 1; w < (int)words[l].size(); w++) for (int w = 1; w < (int)words[lineNum].size(); w++)
whileParameters.push_back(words[l][w]); whileParameters.push_back(words[lineNum][w]);
int numOfBrackets = 1; int numOfBrackets = 1;
for (int p = l + 2; p < (int)words.size(); p++) for (int p = lineNum + 2; p < (int)words.size(); p++)
{ {
numOfBrackets += countInVector(words[p], "{") - countInVector(words[p], "}"); numOfBrackets += countInVector(words[p], "{") - countInVector(words[p], "}");
if (numOfBrackets == 0) if (numOfBrackets == 0)
@ -472,24 +522,24 @@ int ProcessLine(vector<vector<string>> words, int l, vector<string>& variables,
while (BooleanLogic(whileParameters[0], whileParameters[1], whileParameters[2], variables, variableValues)) while (BooleanLogic(whileParameters[0], whileParameters[1], whileParameters[2], variables, variableValues))
{ {
//Iterate through all lines in while loop //Iterate through all lines in while loop
for (int l = 0; l < (int)whileContents.size(); l++) for (int lineNum = 0; lineNum < (int)whileContents.size(); lineNum++)
{ {
ProcessLine(words, l, variables, variableValues); ProcessLine(words, lineNum, variables, variableValues);
} }
} }
return 0; return 0;
} }
// Gathers if statement contents // Gathers if statement contents
if (words[l][0] == "if") if (words[lineNum][0] == "if")
{ {
vector<string> ifContents; vector<string> ifContents;
vector<string> ifParameters; vector<string> ifParameters;
for (int w = 1; w < (int)words[l].size(); w++) for (int w = 1; w < (int)words[lineNum].size(); w++)
ifParameters.push_back(words[l][w]); ifParameters.push_back(words[lineNum][w]);
int numOfBrackets = 1; int numOfBrackets = 1;
for (int p = l + 2; p < (int)words.size(); p++) for (int p = lineNum + 2; p < (int)words.size(); p++)
{ {
numOfBrackets += countInVector(words[p], "{") - countInVector(words[p], "}"); numOfBrackets += countInVector(words[p], "{") - countInVector(words[p], "}");
if (numOfBrackets == 0) if (numOfBrackets == 0)
@ -509,9 +559,9 @@ int ProcessLine(vector<vector<string>> words, int l, vector<string>& variables,
if (BooleanLogic(ifParameters[0], ifParameters[1], ifParameters[2], variables, variableValues)) if (BooleanLogic(ifParameters[0], ifParameters[1], ifParameters[2], variables, variableValues))
{ {
//Iterate through all lines in while loop //Iterate through all lines in while loop
for (int l = 0; l < (int)ifContents.size(); l++) for (int lineNum = 0; lineNum < (int)ifContents.size(); lineNum++)
{ {
ProcessLine(words, l, variables, variableValues); ProcessLine(words, lineNum, variables, variableValues);
} }
} }
return 0; return 0;
@ -537,20 +587,21 @@ int ExecuteFunction(string functionName, vector<string> inputVarVals)
vector<string> variables; vector<string> variables;
vector<string> variableValues; vector<string> variableValues;
vector<string> functionNameParts = split(functions[functionIndex], ' '); vector<string> functionNameParts = split(replace(functions[functionIndex], functionName + " ", ""), ',');
for (int i = 1; i < (int)functionNameParts.size(); i++) for (int i = 0; i < (int)functionNameParts.size(); i++)
{ {
variables.push_back(replace(replace(functionNameParts[i], ",", ""), " ", "")); variables.push_back(trim(functionNameParts[i]));
variableValues.push_back(inputVarVals[i - 1]); variableValues.push_back(GetRealValue(trim(inputVarVals[i]), variables, variableValues));
cout << variables[(int)variables.size() - 1] << " is " << variableValues[(int)variableValues.size() - 1] << endl;
} }
vector<vector<string>> words; vector<vector<string>> words;
for (int i = 0; i < (int)functionLines.size(); i++) for (int i = 0; i < (int)functionLines.size(); i++)
words.push_back(split(functionLines[i], ' ')); words.push_back(split(functionLines[i], ' '));
//Iterate through all lines in function //Iterate through all lines in function
for (int l = 0; l < (int)functionLines.size(); l++) for (int lineNum = 0; lineNum < (int)functionLines.size(); lineNum++)
{ {
ProcessLine(words, l, variables, variableValues); ProcessLine(words, lineNum, variables, variableValues);
} }
return 0; return 0;
} }
@ -609,22 +660,22 @@ int parseSlang(string script)
//Checks if it is variable //Checks if it is variable
else else
{ {
globalVariables.push_back(words[lineNum][1]); globalVariables.push_back(words[lineNum][0] + " " + words[lineNum][1]);
globalVariableValues.push_back((string)words[lineNum][3]); globalVariableValues.push_back((string)words[lineNum][3]);
cout << words[lineNum][1] << " is " << words[lineNum][3] << endl << endl; cout << words[lineNum][1] << " is " << words[lineNum][3] << endl;
} }
} }
// Executes main, which is the starting function // Executes main, which is the starting function
ExecuteFunction("Main", vector<string> {"hi"}); ExecuteFunction("Main", vector<string> {"hi", "7"});
return 0; return 0;
} }
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
std::ifstream t("../Slang/script.sl"); ifstream t("../Slang/script.sl");
std::stringstream scriptString; stringstream scriptString;
scriptString << t.rdbuf(); scriptString << t.rdbuf();
while (true) { while (true) {

25
Slang/script.sl
View File

@ -1,6 +1,6 @@
int x = 1 int x = 1
void Next(in, sin) void Next(string in, string sin)
{ {
string green = "bean" string green = "bean"
green += " " green += " "
@ -11,21 +11,24 @@ void Next(in, sin)
print green print green
} }
void Main(input) void Main(string input, int in2)
{ {
int a = -8 int a = 0
int b = 4 int b = 1
print input print input
print in2
int k = 0 int k = 0
while x < 1000
while x < 1
{ {
k = a
k += b
a = b
b = k
x += 1 print k
print x
} }
Next "seen" "bop" Next "seen", "bop"
} }
Main "hi"