operators: nearly done! /9

andreasdr · Dec 27, 2024 · 7e1cbf8 · 7e1cbf8
1 parent 7ffee53
commit 7e1cbf8
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 52 deletions.
diff --git a/resources/minitscript/tests/array-test.tscript b/resources/minitscript/tests/array-test.tscript
diff --git a/resources/minitscript/tests/initializeroperator-test.tscript b/resources/minitscript/tests/initializeroperator-test.tscript
@@ -0,0 +1,32 @@
+# initialize
+on: initialize
+	console.printLine("--------------------------------------")
+	console.printLine("initializeroperator-test: Initialize")
+	console.printLine("--------------------------------------")
+	console.printLine()
+end
+
+# if no condition is met, nothing will be executed, lol :D
+on: nothing
+	console.printLine("-----------------------------------")
+	console.printLine("initializeroperator-test: Nothing")
+	console.printLine("-----------------------------------")
+	console.printLine()
+	console.printLine("application.getArguments()[0]: " + application.getArguments()[0])
+	console.printLine("{\"a\":1}->contains(\"a\"): " + {"a":1}->contains("a"))
+	console.printLine("{\"a\":1}.a: " + {"a":1}.a)
+	#console.printLine("\"Hi there!!! OpenBSD!!!->getSize()\"": " + "Hi there!!! OpenBSD!!!"->getSize())
+	#console.printLine("[\"FreeBSD\", \"NetBSD\", \"OpenBSD\"]->contains($$.application::OS): " + ["FreeBSD", "NetBSD", "OpenBSD"]->contains($$.application::OS))
+	#
+	script.stop()
+end
+
+# an error has occurred
+on: error
+	console.printLine("-------------------------")
+	console.printLine("initializeroperator-test: Error")
+	console.printLine("-------------------------")
+	console.printLine("error message: " + script.error.getMessage())
+	console.printLine("error statement: " + script.error.getStatement())
+	script.stop()
+end
diff --git a/resources/minitscript/tests/native-test.tscript b/resources/minitscript/tests/native-test.tscript
@@ -215,6 +215,7 @@ on: nothing
 	)
 	testScript(["resources/minitscript/tests/filesystem-test.tscript"], null)
 	testScript(["resources/minitscript/tests/functions-test.tscript"], null)
+	testScript(["resources/minitscript/tests/initializeroperator-test.tscript"], null)
 	testScript(["resources/minitscript/tests/lamdafunctions-test.tscript"], null)
 	testScript(["resources/minitscript/tests/loop-test.tscript"], null)
 	testScript(

diff --git a/src/minitscript/minitscript/MinitScript.cpp b/src/minitscript/minitscript/MinitScript.cpp
@@ -3735,10 +3735,12 @@ const string MinitScript::doStatementPreProcessing(const string& processedStatem
 								string leftArgumentBrackets;
 								int leftArgumentLength = 0;
 								auto leftArgument = findLeftArgument(preprocessedStatement, i - 1, leftArgumentLength, leftArgumentBrackets);
-								// needs to be a variable or function/method call
+								// needs to be a variable or function/method call or a map/set initializer
 								if (leftArgument.length() == 0 ||
 									(leftArgument[0] != '$' &&
-									leftArgument[leftArgument.size() - 1] != ')')) {
+									leftArgument[leftArgument.size() - 1] != ')' &&
+									leftArgument[0] != '{' &&
+									leftArgument[leftArgument.size() - 1] != '}')) {
 									continue;
 								}
 								// no $$, $GLOBAL

diff --git a/tests/runtests.bat b/tests/runtests.bat
@@ -12,6 +12,7 @@
 .\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
+.\bin\minitscript\tools\minitscript resources\minitscript\tests\initializeroperator-test.tscript
 .\bin\minitscript\tools\minitscript resources\minitscript\tests\lamdafunctions-test.tscript
 .\bin\minitscript\tools\minitscript resources\minitscript\tests\loop-test.tscript
 .\bin/minitscript\tools\minitscript resources\minitscript\tests\module-test.tscript

diff --git a/tests/runtests.sh b/tests/runtests.sh
@@ -12,6 +12,7 @@
 ./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
+./bin/minitscript/tools/minitscript resources/minitscript/tests/initializeroperator-test.tscript
 ./bin/minitscript/tools/minitscript resources/minitscript/tests/lamdafunctions-test.tscript
 ./bin/minitscript/tools/minitscript resources/minitscript/tests/loop-test.tscript
 ./bin/minitscript/tools/minitscript resources/minitscript/tests/module-test.tscript