MiniScript: Transpilation: some improvements

Makefile

@@ -544,6 +544,7 @@ SRCS = \
 	src/tdme/tests/MathOperatorTest.cpp \
 	src/tdme/tests/MiniScriptAdvancedTest.cpp \
 	src/tdme/tests/MiniScriptBaseTest.cpp \
+	src/tdme/tests/MiniScriptClassTest.cpp \
 	src/tdme/tests/MiniScriptEmitTest.cpp \
 	src/tdme/tests/MiniScriptFunctionsTest.cpp \
 	src/tdme/tests/PathFindingTest.cpp \
@@ -639,6 +640,7 @@ SRCS = \
 	src/tdme/utilities/Integer.cpp \
 	src/tdme/utilities/MiniScript.cpp \
 	src/tdme/utilities/MiniScriptMath.cpp \
+	src/tdme/utilities/MiniScriptTranspiler.cpp \
 	src/tdme/utilities/ModelTools.cpp \
 	src/tdme/utilities/PathFinding.cpp \
 	src/tdme/utilities/Primitives.cpp \

Makefile.nmake

@@ -405,6 +405,7 @@ SRCS = \
 	src/tdme/tests/MathOperatorTest.cpp \
 	src/tdme/tests/MiniScriptAdvancedTest.cpp \
 	src/tdme/tests/MiniScriptBaseTest.cpp \
+	src/tdme/tests/MiniScriptClassTest.cpp \
 	src/tdme/tests/MiniScriptEmitTest.cpp \
 	src/tdme/tests/MiniScriptFunctionsTest.cpp \
 	src/tdme/tests/PathFindingTest.cpp \
@@ -500,6 +501,7 @@ SRCS = \
 	src/tdme/utilities/Integer.cpp \
 	src/tdme/utilities/MiniScript.cpp \
 	src/tdme/utilities/MiniScriptMath.cpp \
+	src/tdme/utilities/MiniScriptTranspiler.cpp \
 	src/tdme/utilities/ModelTools.cpp \
 	src/tdme/utilities/PathFinding.cpp \
 	src/tdme/utilities/Primitives.cpp \

scripts/transpile-scripts.bat

@@ -1,4 +1,5 @@
 .\bin\tdme\tools\cli\miniscripttranspiler resources\tests\scripts\advanced-test.tscript src\tdme\tests\MiniScriptAdvancedTest.cpp
 .\bin\tdme\tools\cli\miniscripttranspiler resources\tests\scripts\base-test.tscript src\tdme\tests\MiniScriptBaseTest.cpp
+.\bin\tdme\tools\cli\miniscripttranspiler resources\tests\scripts\class-test.tscript src\tdme\tests\MiniScriptClassTest.cpp
 .\bin\tdme\tools\cli\miniscripttranspiler resources\tests\scripts\emit-test.tscript src\tdme\tests\MiniScriptEmitTest.cpp
-.\bin\tdme\tools\cli\miniscripttranspiler resources\tests\scripts\functions-test.tscript src\tdme\tests\MiniScriptFunctionsTest.cpp
+.\bin\tdme\tools\cli\miniscripttranspiler resources\tests\scripts\functions-test.tscript src\tdme\tests\MiniScriptFunctionsTest.cpp

scripts/transpile-scripts.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 ./bin/tdme/tools/cli/miniscripttranspiler resources/tests/scripts/advanced-test.tscript src/tdme/tests/MiniScriptAdvancedTest.cpp
 ./bin/tdme/tools/cli/miniscripttranspiler resources/tests/scripts/base-test.tscript src/tdme/tests/MiniScriptBaseTest.cpp
+./bin/tdme/tools/cli/miniscripttranspiler resources/tests/scripts/class-test.tscript src/tdme/tests/MiniScriptClassTest.cpp
 ./bin/tdme/tools/cli/miniscripttranspiler resources/tests/scripts/emit-test.tscript src/tdme/tests/MiniScriptEmitTest.cpp
-./bin/tdme/tools/cli/miniscripttranspiler resources/tests/scripts/functions-test.tscript src/tdme/tests/MiniScriptFunctionsTest.cpp
+./bin/tdme/tools/cli/miniscripttranspiler resources/tests/scripts/functions-test.tscript src/tdme/tests/MiniScriptFunctionsTest.cpp

scripts/untranspile-scripts.bat

@@ -1,4 +1,5 @@
 .\bin\tdme\tools\cli\miniscriptuntranspiler resources\tests\scripts\advanced-test.tscript src\tdme\tests\MiniScriptAdvancedTest.cpp
 .\bin\tdme\tools\cli\miniscriptuntranspiler resources\tests\scripts\base-test.tscript src\tdme\tests\MiniScriptBaseTest.cpp
+.\bin\tdme\tools\cli\miniscriptuntranspiler resources\tests\scripts\class-test.tscript src\tdme\tests\MiniScriptClassTest.cpp
 .\bin\tdme\tools\cli\miniscriptuntranspiler resources\tests\scripts\emit-test.tscript src\tdme\tests\MiniScriptEmitTest.cpp
 .\bin\tdme\tools\cli\miniscriptuntranspiler resources\tests\scripts\functions-test.tscript src\tdme\tests\MiniScriptFunctionsTest.cpp

scripts/untranspile-scripts.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 ./bin/tdme/tools/cli/miniscriptuntranspiler resources/tests/scripts/advanced-test.tscript src/tdme/tests/MiniScriptAdvancedTest.cpp
 ./bin/tdme/tools/cli/miniscriptuntranspiler resources/tests/scripts/base-test.tscript src/tdme/tests/MiniScriptBaseTest.cpp
+./bin/tdme/tools/cli/miniscriptuntranspiler resources/tests/scripts/class-test.tscript src/tdme/tests/MiniScriptClassTest.cpp
 ./bin/tdme/tools/cli/miniscriptuntranspiler resources/tests/scripts/emit-test.tscript src/tdme/tests/MiniScriptEmitTest.cpp
 ./bin/tdme/tools/cli/miniscriptuntranspiler resources/tests/scripts/functions-test.tscript src/tdme/tests/MiniScriptFunctionsTest.cpp

src/tdme/tests/MiniScriptClassTest.cpp

@@ -0,0 +1,17 @@
+#include "MiniScriptClassTest.h"
+
+#include <tdme/tdme.h>
+#include <tdme/utilities/Console.h>
+#include <tdme/utilities/MiniScript.h>
+#include <tdme/utilities/MiniScriptMath.h>
+
+using tdme::utilities::Console;
+using tdme::utilities::MiniScript;
+using tdme::utilities::MiniScriptMath;
+
+MiniScriptClassTest::MiniScriptClassTest(): MiniScript() {
+	initializeNative();
+}
+
+/*__MINISCRIPT_TRANSPILEDMINISCRIPTCODE_DEFINITIONS_START__*/
+/*__MINISCRIPT_TRANSPILEDMINISCRIPTCODE_DEFINITIONS_END__*/

src/tdme/tests/MiniScriptClassTest.h

@@ -0,0 +1,24 @@
+#include <tdme/tdme.h>
+#include <tdme/utilities/Console.h>
+#include <tdme/utilities/MiniScript.h>
+
+using tdme::utilities::Console;
+using tdme::utilities::MiniScript;
+
+/**
+ * Transpile with './bin/tdme/tools/cli/miniscripttranspiler resources/tests/scripts/class-test.tscript src/tdme/tests/MiniScriptClassTest.cpp'
+ */
+class MiniScriptClassTest: public MiniScript {
+public:
+	// forbid class copy
+	FORBID_CLASS_COPY(MiniScriptClassTest)
+
+	/**
+	 * Public constructor
+	 */
+	MiniScriptClassTest();
+
+	/*__MINISCRIPT_TRANSPILEDMINISCRIPTCODE_DECLARATIONS_START__*/
+	/*__MINISCRIPT_TRANSPILEDMINISCRIPTCODE_DECLARATIONS_END__*/
+
+};

src/tdme/tests/MiniScriptTest-main.cpp

@@ -2,6 +2,7 @@
 
 #include "MiniScriptAdvancedTest.h"
 #include "MiniScriptBaseTest.h"
+#include "MiniScriptClassTest.h"
 #include "MiniScriptEmitTest.h"
 #include "MiniScriptFunctionsTest.h"
 
@@ -34,6 +35,26 @@ int main(int argc, char *argv[]) {
 		Console::println();
 		Console::println();
 	}
+	// class test
+	{
+		auto script = make_unique<MiniScriptClassTest>();
+		script->parseScript("resources/tests/scripts", "class-test.tscript");
+		Console::println("---------------------------------------------------------");
+		Console::println("Loaded test script: " + script->getScriptFileName() + ": runs " + (script->isNative() == true?"natively":"interpreted"));
+		Console::println("---------------------------------------------------------");
+		// Console::println(script->getInformation());
+		if (script->isValid() == false) {
+			Console::println("Script not valid. Exiting");
+			return 1;
+		}
+		while (script->isRunning() == true) {
+			script->execute();
+		}
+		//
+		Console::println();
+		Console::println();
+		Console::println();
+	}
 	// advanced test
 	{
 		auto script = make_unique<MiniScriptAdvancedTest>();

src/tdme/tests/fwd-tdme.h

@@ -15,6 +15,7 @@ namespace tests {
 	class MathOperatorTest;
 	class MiniScriptBaseTest;
 	class MiniScriptAdvancedTest;
+	class MiniScriptClassTest;
 	class MiniScriptEmitTest;
 	class MiniScriptFunctionsTest;
 	class PathFindingTest;

src/tdme/tools/cli/miniscripttranspiler-main.cpp

@@ -18,6 +18,7 @@
 #include <tdme/utilities/Exception.h>
 #include <tdme/utilities/Integer.h>
 #include <tdme/utilities/MiniScript.h>
+#include <tdme/utilities/MiniScriptTranspiler.h>
 #include <tdme/utilities/StringTools.h>
 
 using std::find;
@@ -39,6 +40,7 @@ using tdme::utilities::Console;
 using tdme::utilities::Exception;
 using tdme::utilities::Integer;
 using tdme::utilities::MiniScript;
+using tdme::utilities::MiniScriptTranspiler;
 using tdme::utilities::StringTools;
 
 namespace tdme {
@@ -338,7 +340,7 @@ static void createArrayAccessMethods(MiniScript* miniScript, string& generatedDe
 									auto scriptStateChanged = false;
 									auto scriptStopped = false;
 									vector<string >enabledNamedConditions;
-									scriptInstance->transpileScriptStatement(transpiledCode, arrayAccessSyntaxTree, arrayAccessStatement, MiniScript::SCRIPTIDX_NONE, MiniScript::SCRIPTIDX_NONE, statementIdx, methodCodeMap, scriptStateChanged, scriptStopped, enabledNamedConditions, 0, {}, "ScriptVariable()", "return returnValue;");
+									MiniScriptTranspiler::transpileScriptStatement(scriptInstance, transpiledCode, arrayAccessSyntaxTree, arrayAccessStatement, MiniScript::SCRIPTIDX_NONE, MiniScript::SCRIPTIDX_NONE, statementIdx, methodCodeMap, scriptStateChanged, scriptStopped, enabledNamedConditions, 0, {}, "ScriptVariable()", "return returnValue;");
 									generatedDeclarations+= headerIndent + "/**\n";
 									generatedDeclarations+= headerIndent + " * Miniscript transpilation for a " + (condition == true?"condition":"statement") + " array access statement for method '" + methodName + "', statement index " + to_string(statement.statementIdx) + ", argument indices " + MiniScript::getArgumentIndicesAsString(nextArgumentIndices, ", ") + ", array access statement index " + to_string(arrayAccessStatementIdx) + "\n";
 									generatedDeclarations+= headerIndent + " * @param statement statement" + "\n";
@@ -415,6 +417,7 @@ static void generateMiniScriptEvaluateMemberAccessArrays(MiniScript* miniScript,
 		allMethods.insert(method);
 	}
 	declarations.push_back("// evaluate member access constants");
+	declarations.push_back("static constexpr int EVALUATEMEMBERACCESSARRAYIDX_NONE { -1 };");
 	auto methodIdx = 0;
 	for (const auto& method: allMethods) {
 		declarations.push_back("static constexpr int EVALUATEMEMBERACCESSARRAYIDX_" + StringTools::toUpperCase(method) + " { " + to_string(methodIdx) + " };");
@@ -551,10 +554,23 @@ static void createArrayMapSetVariable(MiniScript* miniScript, const MiniScript::
 				auto scriptStateChanged = false;
 				auto scriptStopped = false;
 				vector<string>enabledNamedConditions;
-				miniScript->transpileScriptStatement(transpiledCode, *variable.getInitializer()->getSyntaxTree(), statement, MiniScript::SCRIPTIDX_NONE, MiniScript::SCRIPTIDX_NONE, statementIdx, methodCodeMap, scriptStateChanged, scriptStopped, enabledNamedConditions, 0, {}, "ScriptVariable()", "const auto& variableD" + to_string(initializerDepth) + " = returnValue; " + postStatement + "\n", 1);
+				MiniScriptTranspiler::transpileScriptStatement(miniScript, transpiledCode, *variable.getInitializer()->getSyntaxTree(), statement, MiniScript::SCRIPTIDX_NONE, MiniScript::SCRIPTIDX_NONE, statementIdx, methodCodeMap, scriptStateChanged, scriptStopped, enabledNamedConditions, 0, {}, "ScriptVariable()", "const auto& variableD" + to_string(initializerDepth) + " = returnValue; " + postStatement + "\n", 1);
 				generatedDefinitions+= transpiledCode;
 			}
 			break;
+		case MiniScript::TYPE_FUNCTION_ASSIGNMENT:
+			{
+				string value;
+				variable.getStringValue(value);
+				value = StringTools::replace(StringTools::replace(value, "\\", "\\\\"), "\"", "\\\"");
+				//
+				generatedDefinitions+= indent + "{" + "\n";
+				generatedDefinitions+= indent + "\t" + "ScriptVariable variableD" + to_string(initializerDepth) + ";" + "\n";
+				generatedDefinitions+= indent + "\t" + "variableD" + to_string(initializerDepth) + ".setFunctionAssignment(\"" + value + "\");" + "\n";
+				generatedDefinitions+= indent + "\t" + postStatement + "\n";
+				generatedDefinitions+= indent + "}" + "\n";
+			}
+			break;
 		default: break;
 	}
 }
@@ -914,7 +930,7 @@ static void processFile(const string& scriptFileName, const string& miniscriptTr
 			// transpile definition
 			generatedDefinitions+= "void " + miniScriptClassName + "::" + methodName + "(int miniScriptGotoStatementIdx) {" + "\n";
 			string generatedSubCode;
-			scriptInstance->transpile(generatedSubCode, scriptIdx, methodCodeMap);
+			MiniScriptTranspiler::transpile(scriptInstance.get(), generatedSubCode, scriptIdx, methodCodeMap);
 			generatedDefinitions+= generatedSubCode;
 			generatedDefinitions+= string() + "}" + "\n\n";
 
@@ -925,7 +941,8 @@ static void processFile(const string& scriptFileName, const string& miniscriptTr
 					generatedDetermineNamedScriptIdxToStartDefinition+= string() + "\t" + "\t" + "// next statements belong to tested enabled named condition with name \"" + script.name + "\"" + "\n";
 					generatedDetermineNamedScriptIdxToStartDefinition+= string() + "\t" + "\t" + "if (enabledNamedCondition == \"" + script.name + "\")" + "\n";
 				}
-				scriptInstance->transpileScriptCondition(
+				MiniScriptTranspiler::transpileScriptCondition(
+					scriptInstance.get(),
 					script.scriptType == MiniScript::Script::SCRIPTTYPE_ON?generatedDetermineScriptIdxToStartDefinition:generatedDetermineNamedScriptIdxToStartDefinition,
 					scriptIdx,
 					methodCodeMap,