update

Author: lemonorangeapple

src/identifiers/end_loop.hpp

@@ -10,14 +10,10 @@ void end_loop(vector<string>::iterator it, ifstream &file) {
             if (variables[loopVariableName.top()] == 0) {
                 // Pop loop flag
                 loopFlag.pop();
-                break;
             }
-            else {
-                // Check if loop line is empty
-                if (!loopLine.empty()) {
-                    // Seekg to loop line
-                    file.seekg(int(loopLine.top()) - 2);
-                }
+            else if (!loopLine.empty()) {
+                // Seekg to loop line
+                file.seekg(int(loopLine.top()) - 3);
             }
         }
         else {

src/identifiers/equal.hpp

@@ -5,10 +5,10 @@
 void equal(vector<string>::iterator it, ifstream &file) {
     string a = *(it + 1), b = *(it + 2), c = *(it + 3);
     if (isInteger(b)) {
-        variables[c] = (variables[a] == b);
+        variables[c] = (variables[a] == atoi(b.c_str()));
     }
     else if (isInteger(a)){
-        variables[c] = (a == variables[b]);
+        variables[c] = (atoi(a.c_str()) == variables[b]);
     }
     else {
         variables[c] = (variables[a] == variables[b]);

src/identifiers/equal_or_greater.hpp

@@ -5,10 +5,10 @@
 void equal_or_greater(vector<string>::iterator it, ifstream &file) {
     string a = *(it + 1), b = *(it + 2), c = *(it + 3);
     if (isInteger(b)) {
-        variables[c] = (variables[a] >= b);
+        variables[c] = (variables[a] >= atoi(b.c_str()));
     }
     else if (isInteger(a)){
-        variables[c] = (a >= variables[b]);
+        variables[c] = (atoi(a.c_str()) >= variables[b]);
     }
     else {
         variables[c] = (variables[a] >= variables[b]);

src/identifiers/equal_or_less.hpp

@@ -5,10 +5,10 @@
 void equal_or_less(vector<string>::iterator it, ifstream &file) {
     string a = *(it + 1), b = *(it + 2), c = *(it + 3);
     if (isInteger(b)) {
-        variables[c] = (variables[a] <= b);
+        variables[c] = (variables[a] <= atoi(b.c_str()));
     }
     else if (isInteger(a)){
-        variables[c] = (a <= variables[b]);
+        variables[c] = (atoi(a.c_str()) <= variables[b]);
     }
     else {
         variables[c] = (variables[a] <= variables[b]);

src/identifiers/greater.hpp

@@ -5,10 +5,10 @@
 void _greater(vector<string>::iterator it, ifstream &file) {
     string a = *(it + 1), b = *(it + 2), c = *(it + 3);
     if (isInteger(b)) {
-        variables[c] = (variables[a] > b);
+        variables[c] = (variables[a] > atoi(b.c_str()));
     }
     else if (isInteger(a)){
-        variables[c] = (a > variables[b]);
+        variables[c] = (atoi(a.c_str()) > variables[b]);
     }
     else {
         variables[c] = (variables[a] > variables[b]);

src/identifiers/identifiers.hpp

@@ -4,8 +4,6 @@
 #include "output.hpp"
 // Wrap
 #include "wrap.hpp"
-// New
-#include "new.hpp"
 // Set
 #include "set.hpp"
 // Input

src/identifiers/if.hpp

@@ -3,7 +3,7 @@
  * By lemonorangeapple
 **/
 void _if(vector<string>::iterator it, ifstream &file) {
-    if (variables[*(it + 1)].value == 0) {
+    if (variables[*(it + 1)] == 0) {
         // Push false if the variable value is 0
         ifFlag.push(false);
     }

src/identifiers/input.hpp

@@ -5,5 +5,5 @@
 void input(vector<string>::iterator it, ifstream &file) {
     long double temp;
     cin >> temp;
-    variables[*(it + 1)].value = temp;
+    variables[*(it + 1)] = temp;
 }

src/identifiers/less.hpp

@@ -5,10 +5,10 @@
 void _less(vector<string>::iterator it, ifstream &file) {
     string a = *(it + 1), b = *(it + 2), c = *(it + 3);
     if (isInteger(b)) {
-        variables[c] = (variables[a] < b);
+        variables[c] = (variables[a] < atoi(b.c_str()));
     }
     else if (isInteger(a)){
-        variables[c] = (a < variables[b]);
+        variables[c] = (atoi(a.c_str()) < variables[b]);
     }
     else {
         variables[c] = (variables[a] < variables[b]);

src/identifiers/not.hpp

@@ -3,6 +3,6 @@
  * By lemonorangeapple
 **/
 void _not(vector<string>::iterator it, ifstream &file) {
-    string next = (*it + 1);
+    string next = *(it + 1);
     variables[next] = !(bool(variables[next]));
 }