Revisit Emscripten

huwdp · Dec 4, 2023 · 8c40702 · 8c40702
1 parent 8877cef
commit 8c40702
Show file tree

Hide file tree

Showing 380 changed files with 15,755 additions and 30 deletions.
diff --git a/build-appimage/README.txt b/build-appimage/README.txt
diff --git a/build-appimage/build-app-image.sh b/build-appimage/build-app-image.sh
diff --git a/build-appimage/huwcode.desktop b/build-appimage/huwcode.desktop
diff --git a/build-appimage/huwcode.png b/build-appimage/huwcode.png
diff --git a/examples/fib.hco b/examples/fib.hco
diff --git a/examples/fizzbuzz.hco b/examples/fizzbuzz.hco
diff --git a/examples/functions.hco b/examples/functions.hco
diff --git a/examples/functions2.hco b/examples/functions2.hco
diff --git a/examples/functions3.hco b/examples/functions3.hco
diff --git a/examples/ifelse.hco b/examples/ifelse.hco
diff --git a/examples/logic1.hco b/examples/logic1.hco
diff --git a/examples/math1.hco b/examples/math1.hco
diff --git a/license.txt b/license.txt
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -8,11 +8,15 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 if (WIN32)
     set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wlogical-op -Wuseless-cast -Wdouble-promotion -Wformat=2 -static-libgcc -static-libstdc++ -I$mxe/usr/i686-w64-mingw32.static/include -Wall -Wextra -Wlogical-op -Wuseless-cast -Wdouble-promotion -Wformat=2  -lkernel32 -luser32 -lgdi32 -lshell32 -DGLEW_STATIC=1 -DAL_LIBTYPE_STATIC=1")
+elseif(EMSCRIPTEN)
+    set(CMAKE_CXX_FLAGS "-o out.html")
 else()
     set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wlogical-op -Wuseless-cast -Wdouble-promotion -Wformat=2")
 endIf()
 
-
+if (EMSCRIPTEN)
+    set(CMAKE_EXECUTABLE_SUFFIX .html)
+endif()
 
 include(FindPkgConfig)
 
@@ -395,17 +399,7 @@ set(HEADER
 
 add_executable(${PROJECT_NAME} ${SOURCE} ${HEADER})
 
-IF(MINGW)
-ELSE()
-pkg_check_modules(CURL libcurl REQUIRED)
-include_directories(
-  SYSTEM ${CURL_INCLUDE_DIRS}
-)
-target_link_libraries(${PROJECT_NAME}
-  ${CURL_LIBRARIES}
-)
-#pkg_check_modules(READLINE readline REQUIRED)
-ENDIF(MINGW)
+
 
 include_directories(
   SYSTEM ${READLINE_INCLUDE_DIRS}

diff --git a/source/build.sh b/source/build.sh
diff --git a/source/build_windows.sh b/source/build_windows.sh
diff --git a/source/emscripten.sh b/source/emscripten.sh
@@ -0,0 +1,6 @@
+rm -rf wasm-build
+mkdir wasm-build
+cd wasm-build
+emcmake cmake ..
+cmake --build . --target HuwInterpreter
+
diff --git a/source/errors/debug.cpp b/source/errors/debug.cpp
diff --git a/source/errors/debug.h b/source/errors/debug.h
diff --git a/source/errors/error.cpp b/source/errors/error.cpp
diff --git a/source/errors/error.h b/source/errors/error.h
diff --git a/source/errors/errors.cpp b/source/errors/errors.cpp
diff --git a/source/errors/errors.h b/source/errors/errors.h
diff --git a/source/errors/errortypes.h b/source/errors/errortypes.h
diff --git a/source/errors/errortypestringfactory.cpp b/source/errors/errortypestringfactory.cpp
diff --git a/source/errors/errortypestringfactory.h b/source/errors/errortypestringfactory.h
diff --git a/source/errors/ierrors.h b/source/errors/ierrors.h
diff --git a/source/functions/abs.cpp b/source/functions/abs.cpp
diff --git a/source/functions/abs.h b/source/functions/abs.h
diff --git a/source/functions/acos.cpp b/source/functions/acos.cpp
diff --git a/source/functions/acos.h b/source/functions/acos.h
diff --git a/source/functions/asc.cpp b/source/functions/asc.cpp
diff --git a/source/functions/asc.h b/source/functions/asc.h
diff --git a/source/functions/asin.cpp b/source/functions/asin.cpp
diff --git a/source/functions/asin.h b/source/functions/asin.h
diff --git a/source/functions/atan.cpp b/source/functions/atan.cpp
diff --git a/source/functions/atan.h b/source/functions/atan.h
diff --git a/source/functions/atan2.cpp b/source/functions/atan2.cpp
diff --git a/source/functions/atan2.h b/source/functions/atan2.h
diff --git a/source/functions/ceil.cpp b/source/functions/ceil.cpp
diff --git a/source/functions/ceil.h b/source/functions/ceil.h
diff --git a/source/functions/cha.cpp b/source/functions/cha.cpp
diff --git a/source/functions/cha.h b/source/functions/cha.h
diff --git a/source/functions/command.cpp b/source/functions/command.cpp
diff --git a/source/functions/command.h b/source/functions/command.h
diff --git a/source/functions/cos.cpp b/source/functions/cos.cpp
diff --git a/source/functions/cos.h b/source/functions/cos.h
diff --git a/source/functions/exp.cpp b/source/functions/exp.cpp
diff --git a/source/functions/exp.h b/source/functions/exp.h
diff --git a/source/functions/fileread.cpp b/source/functions/fileread.cpp
diff --git a/source/functions/fileread.h b/source/functions/fileread.h
diff --git a/source/functions/filewrite.cpp b/source/functions/filewrite.cpp
diff --git a/source/functions/filewrite.h b/source/functions/filewrite.h
diff --git a/source/functions/floor.cpp b/source/functions/floor.cpp
diff --git a/source/functions/floor.h b/source/functions/floor.h
diff --git a/source/functions/function.cpp b/source/functions/function.cpp
diff --git a/source/functions/function.h b/source/functions/function.h
diff --git a/source/functions/functionlist.h b/source/functions/functionlist.h
diff --git a/source/functions/functions.cpp b/source/functions/functions.cpp
@@ -92,7 +92,7 @@ namespace Functions {
         functions["jsonDecode"] = std::make_shared<JSONDecodeFunction>(passable);
         functions["sort"] = std::make_shared<Sort>(passable);
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #elif WIN32
 #else
         functions["httpGet"] = std::make_shared<HttpGetFunction>(passable);
@@ -103,7 +103,8 @@ namespace Functions {
 
 #endif
 
-#ifdef WIN32
+#ifdef __EMSCRIPTEN__
+#elif WIN32
 #else
         functions["now"] = std::make_shared<Now>(passable);
         functions["sleep"] = std::make_shared<SleepFunction>(passable);

diff --git a/source/functions/functions.h b/source/functions/functions.h
diff --git a/source/functions/httpdeletefunction.cpp b/source/functions/httpdeletefunction.cpp
@@ -13,7 +13,7 @@
     along with HuwInterpreter.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #elif _WIN32
 #else
 #include "httpdeletefunction.h"

diff --git a/source/functions/httpdeletefunction.h b/source/functions/httpdeletefunction.h
@@ -13,7 +13,7 @@
     along with HuwInterpreter.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #elif _WIN32
 #else
 #ifndef HTTPDELETEFUNCTION_H

diff --git a/source/functions/httpgetfunction.cpp b/source/functions/httpgetfunction.cpp
@@ -13,7 +13,7 @@
     along with HuwInterpreter.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #elif _WIN32
 #else
 #include "httpgetfunction.h"

diff --git a/source/functions/httpgetfunction.h b/source/functions/httpgetfunction.h
@@ -13,7 +13,7 @@
     along with HuwInterpreter.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #elif _WIN32
 #else
 #ifndef HTTPGETFUNCTION_H

diff --git a/source/functions/httpheadfunction.cpp b/source/functions/httpheadfunction.cpp
@@ -13,7 +13,7 @@
     along with HuwInterpreter.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #elif _WIN32
 #else
 #include "httpheadfunction.h"

diff --git a/source/functions/httpheadfunction.h b/source/functions/httpheadfunction.h
@@ -13,7 +13,7 @@
     along with HuwInterpreter.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #elif _WIN32
 #else
 #ifndef HTTPHEADFUNCTION_H

diff --git a/source/functions/httppostfunction.cpp b/source/functions/httppostfunction.cpp
@@ -13,7 +13,7 @@
     along with HuwInterpreter.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #elif _WIN32
 #else
 #include "httppostfunction.h"

diff --git a/source/functions/httppostfunction.h b/source/functions/httppostfunction.h
@@ -13,7 +13,7 @@
     along with HuwInterpreter.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #elif _WIN32
 #else
 #ifndef HTTPPOSTFUNCTION_H

diff --git a/source/functions/httpputfunction.cpp b/source/functions/httpputfunction.cpp
@@ -13,7 +13,7 @@
     along with HuwInterpreter.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #elif _WIN32
 #else
 #include "httpputfunction.h"

diff --git a/source/functions/httpputfunction.h b/source/functions/httpputfunction.h
@@ -12,7 +12,7 @@
     You should have received a copy of the GNU General Public License
     along with HuwInterpreter.  If not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #elif _WIN32
 #else
 #ifndef HTTPPUTFUNCTION_H

diff --git a/source/functions/instr.cpp b/source/functions/instr.cpp
diff --git a/source/functions/instr.h b/source/functions/instr.h
diff --git a/source/functions/instrrev.cpp b/source/functions/instrrev.cpp
diff --git a/source/functions/instrrev.h b/source/functions/instrrev.h
diff --git a/source/functions/left.cpp b/source/functions/left.cpp
diff --git a/source/functions/left.h b/source/functions/left.h
diff --git a/source/functions/len.cpp b/source/functions/len.cpp
diff --git a/source/functions/len.h b/source/functions/len.h
diff --git a/source/functions/log.cpp b/source/functions/log.cpp
diff --git a/source/functions/log.h b/source/functions/log.h
diff --git a/source/functions/ltrim.cpp b/source/functions/ltrim.cpp
diff --git a/source/functions/ltrim.h b/source/functions/ltrim.h
diff --git a/source/functions/max.cpp b/source/functions/max.cpp
diff --git a/source/functions/max.h b/source/functions/max.h
diff --git a/source/functions/mid.cpp b/source/functions/mid.cpp
diff --git a/source/functions/mid.h b/source/functions/mid.h
diff --git a/source/functions/min.cpp b/source/functions/min.cpp
diff --git a/source/functions/min.h b/source/functions/min.h
diff --git a/source/functions/month.cpp b/source/functions/month.cpp
diff --git a/source/functions/month.h b/source/functions/month.h
diff --git a/source/functions/monthname.cpp b/source/functions/monthname.cpp
diff --git a/source/functions/monthname.h b/source/functions/monthname.h
diff --git a/source/functions/not.cpp b/source/functions/not.cpp
diff --git a/source/functions/not.h b/source/functions/not.h
diff --git a/source/functions/now.cpp b/source/functions/now.cpp
@@ -13,7 +13,7 @@
     along with HuwInterpreter.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #elif _WIN32
 #else
 

diff --git a/source/functions/now.h b/source/functions/now.h
diff --git a/source/functions/pow.cpp b/source/functions/pow.cpp
diff --git a/source/functions/pow.h b/source/functions/pow.h
diff --git a/source/functions/print.cpp b/source/functions/print.cpp
diff --git a/source/functions/print.h b/source/functions/print.h
diff --git a/source/functions/random.cpp b/source/functions/random.cpp
diff --git a/source/functions/random.h b/source/functions/random.h
diff --git a/source/functions/replace.cpp b/source/functions/replace.cpp
diff --git a/source/functions/replace.h b/source/functions/replace.h
diff --git a/source/functions/right.cpp b/source/functions/right.cpp
diff --git a/source/functions/right.h b/source/functions/right.h
diff --git a/source/functions/round.cpp b/source/functions/round.cpp
diff --git a/source/functions/round.h b/source/functions/round.h
diff --git a/source/functions/rtrim.cpp b/source/functions/rtrim.cpp
diff --git a/source/functions/rtrim.h b/source/functions/rtrim.h
diff --git a/source/functions/scan.cpp b/source/functions/scan.cpp
diff --git a/source/functions/scan.h b/source/functions/scan.h
diff --git a/source/functions/sin.cpp b/source/functions/sin.cpp
diff --git a/source/functions/sin.h b/source/functions/sin.h
diff --git a/source/functions/sleepfunction.cpp b/source/functions/sleepfunction.cpp
@@ -13,7 +13,7 @@
     along with HuwInterpreter.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #elif _WIN32
 #else
 #include "sleepfunction.h"

diff --git a/source/functions/space.cpp b/source/functions/space.cpp
diff --git a/source/functions/space.h b/source/functions/space.h
diff --git a/source/functions/sqrt.cpp b/source/functions/sqrt.cpp
diff --git a/source/functions/sqrt.h b/source/functions/sqrt.h
diff --git a/source/functions/str.cpp b/source/functions/str.cpp
diff --git a/source/functions/str.h b/source/functions/str.h
diff --git a/source/functions/strcomp.cpp b/source/functions/strcomp.cpp
diff --git a/source/functions/strcomp.h b/source/functions/strcomp.h
diff --git a/source/functions/strreverse.cpp b/source/functions/strreverse.cpp
diff --git a/source/functions/strreverse.h b/source/functions/strreverse.h
diff --git a/source/functions/tan.cpp b/source/functions/tan.cpp
diff --git a/source/functions/tan.h b/source/functions/tan.h
diff --git a/source/functions/timeformatfunction.cpp b/source/functions/timeformatfunction.cpp
@@ -15,7 +15,8 @@
     along with HuwInterpreter.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef _WIN32
+#ifdef __EMSCRIPTEN__
+#elif _WIN32
 #else
 
 #include "timeformatfunction.h"

diff --git a/source/functions/timeformatfunction.h b/source/functions/timeformatfunction.h
@@ -13,7 +13,7 @@
     along with HuwInterpreter.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 #elif _WIN32
 #else
 

diff --git a/source/functions/tolower.cpp b/source/functions/tolower.cpp
diff --git a/source/functions/tolower.h b/source/functions/tolower.h
diff --git a/source/functions/tostring.cpp b/source/functions/tostring.cpp
diff --git a/source/functions/tostring.h b/source/functions/tostring.h
diff --git a/source/functions/toupper.cpp b/source/functions/toupper.cpp
diff --git a/source/functions/toupper.h b/source/functions/toupper.h
diff --git a/source/functions/trim.cpp b/source/functions/trim.cpp
diff --git a/source/functions/trim.h b/source/functions/trim.h
diff --git a/source/functions/weekday.cpp b/source/functions/weekday.cpp
diff --git a/source/functions/weekday.h b/source/functions/weekday.h
diff --git a/source/functions/weekdayname.cpp b/source/functions/weekdayname.cpp
diff --git a/source/functions/weekdayname.h b/source/functions/weekdayname.h
diff --git a/source/functions/year.cpp b/source/functions/year.cpp
diff --git a/source/functions/year.h b/source/functions/year.h
diff --git a/source/huwinterpreter.cpp b/source/huwinterpreter.cpp
diff --git a/source/huwinterpreter.h b/source/huwinterpreter.h
diff --git a/source/io/fileline.cpp b/source/io/fileline.cpp
diff --git a/source/io/fileline.h b/source/io/fileline.h
diff --git a/source/io/io.cpp b/source/io/io.cpp
diff --git a/source/io/io.h b/source/io/io.h
diff --git a/source/main.cpp b/source/main.cpp
@@ -26,7 +26,7 @@
 #include "tokens/filetokenmanager.h"
 
 #ifdef _WIN32
-#elif EMSCRIPTEN
+#elif __EMSCRIPTEN__
 #else
 //#include <readline/readline.h>
 //#include <readline/history.h>
@@ -57,7 +57,7 @@ std::string readUserInput()
     std::string input;
     std::cin >> input;
     return input;
-#elif EMSCRIPTEN
+#elif __EMSCRIPTEN__
     std::string input;
     std::cin >> input;
     return input;
@@ -75,6 +75,22 @@ std::string readUserInput()
 
 int main(int argc, char* argv[])
 {
+#if __EMSCRIPTEN__
+    std::shared_ptr<HuwInterpreter::Interpreter> interpreter = std::make_shared<HuwInterpreter::Interpreter>();
+    while (true)
+    {
+        std::cout << ">>> ";
+        std::string text;
+        std::cin >> text;
+        if (text == "exit")
+        {
+            std::exit(0);
+        }
+        std::cout << std::endl;
+        interpreter->execute(interpreter->parseText(text));
+    }
+    std::exit(0);
+#else
     std::shared_ptr<HuwInterpreter::Interpreter> interpreter = std::make_shared<HuwInterpreter::Interpreter>();
     if (argc < 2)
     {
@@ -126,4 +142,5 @@ int main(int argc, char* argv[])
         interpreter->executeFile(argument);
     }
     std::exit(0);
+#endif
 }
diff --git a/source/nodes/addnode.cpp b/source/nodes/addnode.cpp
diff --git a/source/nodes/bracketnode.cpp b/source/nodes/bracketnode.cpp
diff --git a/source/nodes/divnode.cpp b/source/nodes/divnode.cpp
diff --git a/source/nodes/equalnode.cpp b/source/nodes/equalnode.cpp
diff --git a/source/nodes/getfuncnode.cpp b/source/nodes/getfuncnode.cpp
diff --git a/source/nodes/getvarnode.cpp b/source/nodes/getvarnode.cpp
diff --git a/source/nodes/ifandnode.cpp b/source/nodes/ifandnode.cpp
diff --git a/source/nodes/ifequalnode.cpp b/source/nodes/ifequalnode.cpp
diff --git a/source/nodes/ifnode.cpp b/source/nodes/ifnode.cpp
diff --git a/source/nodes/ifnotequalnode.cpp b/source/nodes/ifnotequalnode.cpp
diff --git a/source/nodes/ifornode.cpp b/source/nodes/ifornode.cpp
diff --git a/source/nodes/ifovernode.cpp b/source/nodes/ifovernode.cpp
diff --git a/source/nodes/ifoverorequalnode.cpp b/source/nodes/ifoverorequalnode.cpp
diff --git a/source/nodes/ifundernode.cpp b/source/nodes/ifundernode.cpp
diff --git a/source/nodes/ifunderorequalnode.cpp b/source/nodes/ifunderorequalnode.cpp
diff --git a/source/nodes/modnode.cpp b/source/nodes/modnode.cpp
diff --git a/source/nodes/mulnode.cpp b/source/nodes/mulnode.cpp
diff --git a/source/nodes/numbernode.cpp b/source/nodes/numbernode.cpp
diff --git a/source/nodes/runnode.cpp b/source/nodes/runnode.cpp
diff --git a/source/nodes/setvarnode.cpp b/source/nodes/setvarnode.cpp
diff --git a/source/nodes/subnode.cpp b/source/nodes/subnode.cpp
diff --git a/source/nodes/textnode.cpp b/source/nodes/textnode.cpp
diff --git a/source/nodes/whilenode.cpp b/source/nodes/whilenode.cpp
diff --git a/source/parser/parser.cpp b/source/parser/parser.cpp
diff --git a/source/parser/parser.h b/source/parser/parser.h
diff --git a/source/tokens/filetokenmanager.cpp b/source/tokens/filetokenmanager.cpp
diff --git a/source/tokens/filetokenmanager.h b/source/tokens/filetokenmanager.h
diff --git a/source/tokens/lineinfo.cpp b/source/tokens/lineinfo.cpp
diff --git a/source/tokens/lineinfo.h b/source/tokens/lineinfo.h
diff --git a/source/tokens/scanner.cpp b/source/tokens/scanner.cpp
diff --git a/source/tokens/scanner.h b/source/tokens/scanner.h
diff --git a/source/tokens/texttokenmanager.cpp b/source/tokens/texttokenmanager.cpp
diff --git a/source/tokens/texttokenmanager.h b/source/tokens/texttokenmanager.h
diff --git a/source/tokens/token.cpp b/source/tokens/token.cpp
diff --git a/source/tokens/token.h b/source/tokens/token.h
diff --git a/source/tokens/tokenlist.cpp b/source/tokens/tokenlist.cpp
diff --git a/source/tokens/tokenlist.h b/source/tokens/tokenlist.h
diff --git a/source/tokens/tokenmanager.h b/source/tokens/tokenmanager.h
diff --git a/source/types/isnumeric.h b/source/types/isnumeric.h
diff --git a/source/types/tokentypes.h b/source/types/tokentypes.h
diff --git a/source/types/typedetector.cpp b/source/types/typedetector.cpp
diff --git a/source/types/typedetector.h b/source/types/typedetector.h
diff --git a/source/variables/doublevariable.cpp b/source/variables/doublevariable.cpp
diff --git a/source/variables/doublevariable.h b/source/variables/doublevariable.h
diff --git a/source/variables/hashtablevariable.cpp b/source/variables/hashtablevariable.cpp
diff --git a/source/variables/hashtablevariable.h b/source/variables/hashtablevariable.h
diff --git a/source/variables/precision.cpp b/source/variables/precision.cpp
diff --git a/source/variables/precision.h b/source/variables/precision.h
diff --git a/source/variables/scope.cpp b/source/variables/scope.cpp
diff --git a/source/variables/scope.h b/source/variables/scope.h
diff --git a/source/variables/stringvariable.cpp b/source/variables/stringvariable.cpp
diff --git a/source/variables/stringvariable.h b/source/variables/stringvariable.h
diff --git a/source/variables/variable.cpp b/source/variables/variable.cpp
diff --git a/source/variables/variable.h b/source/variables/variable.h
diff --git a/source/variables/variables.cpp b/source/variables/variables.cpp
diff --git a/source/variables/variables.h b/source/variables/variables.h
diff --git a/source/variables/variabletypefactory.cpp b/source/variables/variabletypefactory.cpp
diff --git a/source/variables/variabletypefactory.h b/source/variables/variabletypefactory.h