new feature OwO

Author: Matthilde

engine.cpp

@@ -93,11 +93,11 @@ int ExecuteLine(std::string line, int pptr) {
     } else if (starts_with(line, "* ")) {
         string o = line.erase(0, 2);
 
-        if (o == "" || !isalpha(o.at(0))) {
+        if (o == "") {
             cout << "!SYNTAX ERROR" << endl;
             return -1;
         } else {
-            cout << to_string(intvars[toupper(o.at(0)) - 'A']);
+            cout << to_string(evalString(o, intvars, false));
             return 0;
         }
     } else if (starts_with(line, "=* ")) {

libs/stringop.cpp

@@ -4,6 +4,8 @@
 #include <iostream>
 #include <string>
 #include <ctype.h>
+#include <time.h>
+
 #include "stringop.h"
 using namespace std;
 
@@ -20,13 +22,15 @@ int* moveArrayLeft(int* arr, int start, int end) {
 }
 
 int evalString(std::string o, const int* vars, bool dev) {
+    srand(time(NULL));
     /* the vars array is the array where variables are stored.
        This has been made for being able to make arithmetics with
        variables of the BASIC Interpreter. If you don't need that, 
        just put an empty array.*/
 
     int* numbers = new int[100];
     int* ops = new int[99];  // 0 = Nothing | 1 = + | 2 = - | 3 = * | 4 = /
+    int* parentheses = new int[100];    // 0 = None | 1 = ( | 2 = )
     // Supported operators : * / + -
     // Parentheses aren't supported.
     char c;
@@ -41,7 +45,7 @@ int evalString(std::string o, const int* vars, bool dev) {
             return 0;
         }
         c = o.at(i);
-        if (previousType == 0) {
+        if (previousType == 0 || previousType == 2) {
             if (isoperator(c)) {
                 cout << "[stringop.cpp] Syntax Error! (Misplaced operator)" << endl;
                 return 0;
@@ -50,17 +54,27 @@ int evalString(std::string o, const int* vars, bool dev) {
                 numbers[ptr] = c - '0';
                 continue;
             } else if (isalpha(c)) {
-                previousType = 3;
-                numbers[ptr] = vars[toupper(c) - 'A'];
-                continue;
+                if (isupper(c)) {           // User defined variables
+                    previousType = 3;
+                    numbers[ptr] = vars[toupper(c) - 'A'];
+                    continue;
+                } else if (islower(c)) {    // System variables
+                    previousType = 3;
+                    if (c == 'r')
+                        numbers[ptr] = rand() % 1000;
+                    else {
+                        cout << "[stringop.cpp] Syntax Error! (Invalid system variable)" << endl;
+                        return 0;
+                    }
+                }
             } else if (c == ' ')
                 continue;
             else {
                 cout << "[stringop.cpp] Syntax Error! (Unknown character)" << endl;
                 return 0;
             }
 
-        } else if (previousType == 1) {
+        } else if (previousType == 1 || previousType == 3) {
             if (isoperator(c)) {
                 previousType = 2;
                 if (c == '+')
@@ -86,47 +100,6 @@ int evalString(std::string o, const int* vars, bool dev) {
                 cout << "[stringop.cpp] Syntax Error! (Unknown character)" << endl;
                 return 0;
             }
-        } else if (previousType == 2) {
-            if (isoperator(c)) {
-                cout << "[stringop.cpp] Syntax Error! (Misplaced operator)" << endl;
-                return 0;
-            } else if (isdigit(c)) {
-                previousType = 1;
-                numbers[ptr] = c - '0';
-                continue;
-            } else if (isalpha(c)) {
-                previousType = 3;
-                numbers[ptr] = vars[toupper(c) - 'A'];
-                continue;
-            } else if (c == ' ')
-                continue;
-            else {
-                cout << "[stringop.cpp] Syntax Error! (Unknown character)" << endl;
-                return 0;
-            }
-        } else if (previousType == 3) {
-            if (isoperator(c)) {
-                previousType = 2;
-                if (c == '+')
-                    ops[ptr] = 1;
-                if (c == '-')
-                    ops[ptr] = 2;
-                if (c == '*')
-                    ops[ptr] = 3;
-                if (c == '/')
-                    ops[ptr] = 4;
-                
-                ++ptr;
-                continue;
-            } else if (isalpha(c)) {
-                cout << "[stringop.cpp] Syntax Error! (Misplaced variable)" << endl;
-                return 0;
-            } else if (c == ' ')
-                continue;
-            else {
-                cout << "[stringop.cpp] Syntax Error! (Unknown character)" << endl;
-                return 0;
-            }
         }
     }