Merge pull request #16 from JunLang-dev/development

lemonorangeapple · web-flow · commit 74a580d2293b · 2023-09-08T21:11:50.000+08:00
v1.14.4
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/src/const.hpp b/src/const.hpp
diff --git a/src/identifiers/end_if.hpp b/src/identifiers/end_if.hpp
@@ -1,4 +1,3 @@
-#include "../init.hpp"
 void end_if(vector<string>::iterator it) {
     if (!ifFlag.empty()) {
         ifFlag.pop();
diff --git a/src/identifiers/end_loop.hpp b/src/identifiers/end_loop.hpp
@@ -1,4 +1,3 @@
-#include "../init.hpp"
 void end_loop(vector<string>::iterator it, ifstream &file) {
     if (!loopFlag.empty()) {
         if (loopFlag.top() == true) {
@@ -10,7 +9,7 @@ void end_loop(vector<string>::iterator it, ifstream &file) {
                     }
                     else {
                         if (!loopLine.empty()) {
-                            file.seekg(loopLine.top() - 2);
+                            file.seekg(int(loopLine.top()) - 2);
                         }
                         break;
                     }
diff --git a/src/identifiers/equal_or_greater.hpp b/src/identifiers/equal_or_greater.hpp
@@ -1,4 +1,3 @@
-#include "../init.hpp"
 void equal_or_greater(vector<string>::iterator it) {
     bool undeclared = true;
     for (int i = 0; i <= variableCount; i++) {
diff --git a/src/identifiers/equal_or_less.hpp b/src/identifiers/equal_or_less.hpp
@@ -1,4 +1,3 @@
-#include "../init.hpp"
 void equal_or_less(vector<string>::iterator it) {
     bool undeclared = true;
     for (int i = 0; i <= variableCount; i++) {
diff --git a/src/identifiers/if.hpp b/src/identifiers/if.hpp
@@ -1,4 +1,3 @@
-#include "../init.hpp"
 void _if(vector<string>::iterator it) {
     bool variable = false;
     for (int i = 0; i <= variableCount; i++) {
diff --git a/src/identifiers/less.hpp b/src/identifiers/less.hpp
@@ -1,4 +1,3 @@
-#include "../init.hpp"
 void _less(vector<string>::iterator it) {
     bool undeclared = true;
     for (int i = 0; i <= variableCount; i++) {
diff --git a/src/identifiers/loop.hpp b/src/identifiers/loop.hpp
@@ -1,4 +1,3 @@
-#include "../init.hpp"
 void loop(vector<string>::iterator it, ifstream &file) {
     bool variable = false;
     for (int i = 0; i <= variableCount; i++) {
@@ -8,7 +7,7 @@ void loop(vector<string>::iterator it, ifstream &file) {
                 loopFlag.push(false);
             }
             else {
-                loopLine.push(file.tellg() - 2);
+                loopLine.push(int(file.tellg()) - 2);
                 loopFlag.push(true);
             }
             variable = true;
diff --git a/src/identifiers/not.hpp b/src/identifiers/not.hpp
@@ -1,4 +1,3 @@
-#include "../init.hpp"
 void _not(vector<string>::iterator it) {
     bool undeclared = true;
     for (int i = 0; i <= variableCount; i++) {
diff --git a/src/identifiers/output.hpp b/src/identifiers/output.hpp
@@ -3,7 +3,7 @@ void output(vector<string>::iterator it) {
         bool variable = false;
         for (int i = 0; i <= variableCount; i++) {
             if (variables[i].name == *(it + 1)) {
-                cout << variables[i].value;
+                printf("%.3Lf", variables[i].value);
                 variable = true;
                 break;
             }
diff --git a/src/init.hpp b/src/init.hpp
@@ -1,13 +1,68 @@
 #include <iostream>
-#include <stdlib.h>
-#include <cstring>
+#include <cstdlib>
 #include <vector>
+#include <cstring>
 #include <fstream>
 #include <sstream>
 #include <stack>
+#include <cmath>
 #include <condition_variable>
+#include <climits>
 using namespace std;
-#pragma GCC optimize(3, "Ofast", "inline")
 #pragma GCC std("c++11")
-#define _VERSION_ "v1.14.3"
-#define _BUFFER_SIZE_ 1024
+const string _VERSION_ = "v1.14.4";
+const int _BUFFER_SIZE_ = 1024;
+const string identifiers[] = {
+    "output",
+    "wrap",
+    "new",
+    "set",
+    "input",
+    "addition",
+    "subtraction",
+    "multiplication",
+    "division",
+    "equal",
+    "greater",
+    "less",
+    "equal-or-greater",
+    "equal-or-less",
+    "not",
+    "if",
+    "end-if",
+    "loop", 
+    "end-loop"
+};
+struct Variable {
+    long double value;
+    string name;
+};
+
+vector<string> split(string str, char delim) {
+    stringstream ss(str);
+    string item;
+    vector<string> result;
+    while (getline(ss, item, delim)) {
+        if (!item.empty()) {
+            result.push_back(item);
+        }
+    }
+    return result;
+}
+bool isInteger(string x) {
+    bool integer = true;
+    for (int i = 0; i < strlen(x.c_str()); i++) {
+        if (x[i] < '0' || x[i] > '9') {
+            integer = false;
+            break;
+        }
+    }
+    return integer;
+}
+char buffer[_BUFFER_SIZE_];
+Variable variables[_BUFFER_SIZE_];
+stack<bool> ifFlag;
+stack<bool> loopFlag;
+stack<string> loopVariableName;
+stack<streampos> loopLine;
+int variableCount = 0;
diff --git a/src/interpreter.hpp b/src/interpreter.hpp
@@ -1,10 +1,14 @@
 #include "identifiers/identifiers.hpp"
 void interpreter(vector<string> vec, ifstream &file) {
     for (vector<string>::iterator it = vec.begin(); it != vec.end(); ++it) {
+        if ((*it) == "") {
+            continue;
+        }
         bool unknow = true;
         for (int i = 0; i < (sizeof(identifiers) / sizeof(string)); i++) {
             if (identifiers[i] == *it) {
                 unknow = false;
+                break;
             }
         }
         if (!unknow) {
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,5 +1,4 @@
 #include "init.hpp"
-#include "const.hpp"
 #include "read.hpp"
 int main(int argc, char* argv[]) {
     if (argc == 1) {
@@ -9,4 +8,4 @@ int main(int argc, char* argv[]) {
     }
     read(argv);
     return 0;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include "../init.hpp"`
`2`	`1`	`void end_if(vector<string>::iterator it) {`
`3`	`2`	`if (!ifFlag.empty()) {`
`4`	`3`	`ifFlag.pop();`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include "../init.hpp"`
`2`	`1`	`void end_loop(vector<string>::iterator it, ifstream &file) {`
`3`	`2`	`if (!loopFlag.empty()) {`
`4`	`3`	`if (loopFlag.top() == true) {`
`@@ -10,7 +9,7 @@ void end_loop(vector<string>::iterator it, ifstream &file) {`
`10`	`9`	`}`
`11`	`10`	`else {`
`12`	`11`	`if (!loopLine.empty()) {`
`13`		`- file.seekg(loopLine.top() - 2);`
	`12`	`+ file.seekg(int(loopLine.top()) - 2);`
`14`	`13`	`}`
`15`	`14`	`break;`
`16`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include "../init.hpp"`
`2`	`1`	`void equal_or_greater(vector<string>::iterator it) {`
`3`	`2`	`bool undeclared = true;`
`4`	`3`	`for (int i = 0; i <= variableCount; i++) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include "../init.hpp"`
`2`	`1`	`void equal_or_less(vector<string>::iterator it) {`
`3`	`2`	`bool undeclared = true;`
`4`	`3`	`for (int i = 0; i <= variableCount; i++) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include "../init.hpp"`
`2`	`1`	`void _if(vector<string>::iterator it) {`
`3`	`2`	`bool variable = false;`
`4`	`3`	`for (int i = 0; i <= variableCount; i++) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include "../init.hpp"`
`2`	`1`	`void _less(vector<string>::iterator it) {`
`3`	`2`	`bool undeclared = true;`
`4`	`3`	`for (int i = 0; i <= variableCount; i++) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include "../init.hpp"`
`2`	`1`	`void loop(vector<string>::iterator it, ifstream &file) {`
`3`	`2`	`bool variable = false;`
`4`	`3`	`for (int i = 0; i <= variableCount; i++) {`
`@@ -8,7 +7,7 @@ void loop(vector<string>::iterator it, ifstream &file) {`
`8`	`7`	`loopFlag.push(false);`
`9`	`8`	`}`
`10`	`9`	`else {`
`11`		`- loopLine.push(file.tellg() - 2);`
	`10`	`+ loopLine.push(int(file.tellg()) - 2);`
`12`	`11`	`loopFlag.push(true);`
`13`	`12`	`}`
`14`	`13`	`variable = true;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#include "../init.hpp"`
`2`	`1`	`void _not(vector<string>::iterator it) {`
`3`	`2`	`bool undeclared = true;`
`4`	`3`	`for (int i = 0; i <= variableCount; i++) {`