optionalevents: initial checkin / 10

andreasdr · Dec 31, 2024 · 9e940da · 9e940da
1 parent 7d73813
commit 9e940da
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/src/minitscript/minitscript.h b/src/minitscript/minitscript.h
@@ -21,5 +21,3 @@ using std::string;
 #if !defined(MINITSCRIPT_DATA)
 	#define MINITSCRIPT_DATA string(".")
 #endif
-
-#define MINITSCRIPT_EVENTS
diff --git a/src/minitscript/minitscript/MinitScript.cpp b/src/minitscript/minitscript/MinitScript.cpp
@@ -2044,8 +2044,7 @@ bool MinitScript::parseScriptInternal(const string& scriptCode, const string& _m
 							"elseif (" + containerVariableType + " == \"Set\"); " +
 								containerArrayVariable + " = Set::getKeys(" + containerVariable + "); " +
 							"else; " +
-								"console.printLine(\"forEach() expects array or set as container, but got \" + String::toLowerCase(getType(" + containerVariable + "))); " +
-								"script.emit(\"error\"); " +
+								"throw(\"forEach() expects array or set as container, but got \" + String::toLowerCase(getType(" + containerVariable + "))); " +
 							"end; " +
 							iterationVariable + " = 0; " +
 							"if (" + iterationVariable + " < Array::getSize(" + containerArrayVariable + ")); " +
@@ -2158,8 +2157,7 @@ bool MinitScript::parseScriptInternal(const string& scriptCode, const string& _m
 							"if (" + containerVariableType + " == \"Map\"); " +
 								containerArrayVariable + " = Map::getKeys(" + containerVariable + "); " +
 							"else; " +
-								"console.printLine(\"forEach() expects map as container, but got \" + String::toLowerCase(getType(" + containerVariable + "))); " +
-								"script.emit(\"error\"); " +
+								"throw(\"forEach() expects map as container, but got \" + String::toLowerCase(getType(" + containerVariable + "))); " +
 							"end; " +
 							iterationVariable + " = 0; " +
 							"if (" + iterationVariable + " < Array::getSize(" + containerArrayVariable + ")); " +

diff --git a/src/minitscript/minitscript/MinitScript.h b/src/minitscript/minitscript/MinitScript.h
@@ -3620,8 +3620,9 @@ class minitscript::minitscript::MinitScript {
 		#if defined(MINITSCRIPT_EVENTS)
 			// events
 			if (isFunctionRunning() == false) timeEnabledConditionsCheckLast = TIME_NONE;
-			resetScriptExecutationState(SCRIPTIDX_NONE, STATEMACHINESTATE_NONE);
 		#endif
+		//
+		resetScriptExecutationState(SCRIPTIDX_NONE, STATEMACHINESTATE_NONE);
 	}
 
 	/**

diff --git a/tests/runtests.bat b/tests/runtests.bat
@@ -8,7 +8,7 @@
 .\bin\minitscript\tools\minitscript resources\minitscript\tests\constants-test.tscript
 .\bin\minitscript\tools\minitscript resources\minitscript\tests\context-test.tscript
 .\bin\minitscript\tools\minitscript resources\minitscript\tests\cryptography-test.tscript
-.\bin\minitscript\tools\minitscript resources\minitscript\tests\emit-test.tscript
+REM .\bin\minitscript\tools\minitscript resources\minitscript\tests\emit-test.tscript
 .\bin\minitscript\tools\minitscript resources\minitscript\tests\exception-test.tscript
 .\bin\minitscript\tools\minitscript resources\minitscript\tests\filesystem-test.tscript
 .\bin\minitscript\tools\minitscript resources\minitscript\tests\functions-test.tscript

diff --git a/tests/runtests.sh b/tests/runtests.sh
@@ -8,7 +8,7 @@
 ./bin/minitscript/tools/minitscript resources/minitscript/tests/constants-test.tscript
 ./bin/minitscript/tools/minitscript resources/minitscript/tests/context-test.tscript
 ./bin/minitscript/tools/minitscript resources/minitscript/tests/cryptography-test.tscript
-./bin/minitscript/tools/minitscript resources/minitscript/tests/emit-test.tscript
+#./bin/minitscript/tools/minitscript resources/minitscript/tests/emit-test.tscript
 ./bin/minitscript/tools/minitscript resources/minitscript/tests/exception-test.tscript
 ./bin/minitscript/tools/minitscript resources/minitscript/tests/filesystem-test.tscript
 ./bin/minitscript/tools/minitscript resources/minitscript/tests/functions-test.tscript