MiniScript: Transpilation: some improvements

andreasdr · Oct 22, 2023 · e43fa19 · e43fa19
1 parent cec892b
commit e43fa19
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/tdme/tools/cli/miniscripttranspiler-main.cpp b/src/tdme/tools/cli/miniscripttranspiler-main.cpp
@@ -395,7 +395,7 @@ static void createArrayAccessMethods(MiniScript* miniScript, string& generatedDe
 
 static void generateMiniScriptEvaluateMemberAccessArrays(MiniScript* miniScript, vector<string>& declarations, vector<string>& definitions) {
 	auto scriptMethods = miniScript->getMethods();
-	auto allMethods = MiniScriptTranspiler::getAllMethodNames(miniScript);
+	auto allMethods = MiniScriptTranspiler::getAllMethodNamesSorted(miniScript);
 	auto methodsByClasses = MiniScriptTranspiler::getAllClassesMethodNames(miniScript);
 	declarations.push_back("// evaluate member access constants");
 	declarations.push_back("static constexpr int EVALUATEMEMBERACCESSARRAYIDX_NONE { -1 };");

diff --git a/src/tdme/utilities/MiniScriptTranspiler.cpp b/src/tdme/utilities/MiniScriptTranspiler.cpp
@@ -38,7 +38,7 @@ using tdme::math::Vector4;
 using tdme::utilities::Console;
 using tdme::utilities::StringTools;
 
-const vector<string> MiniScriptTranspiler::getAllMethodNames(MiniScript* miniScript) {
+const unordered_set<string> MiniScriptTranspiler::getAllMethodNames(MiniScript* miniScript) {
 	unordered_set<string> allMethods;
 	for (auto scriptMethod: miniScript->getMethods()) {
 		string className;
@@ -58,6 +58,12 @@ const vector<string> MiniScriptTranspiler::getAllMethodNames(MiniScript* miniScr
 		allMethods.insert(method);
 	}
 	//
+	return allMethods;
+}
+
+const vector<string> MiniScriptTranspiler::getAllMethodNamesSorted(MiniScript* miniScript) {
+	auto allMethods = getAllMethodNames(miniScript);
+	//
 	vector<string> result;
 	for (auto method: allMethods) result.push_back(method);
 	sort(result.begin(), result.end());

diff --git a/src/tdme/utilities/MiniScriptTranspiler.h b/src/tdme/utilities/MiniScriptTranspiler.h
@@ -25,10 +25,17 @@ class tdme::utilities::MiniScriptTranspiler {
 	 * @param miniScript MiniScript instance
 	 * @return all method names
 	 */
-	static const vector<string> getAllMethodNames(MiniScript* miniScript);
+	static const unordered_set<string> getAllMethodNames(MiniScript* miniScript);
 
 	/**
-	 * Get all method names
+	 * Get all method names sorted
+	 * @param miniScript MiniScript instance
+	 * @return all method names sorted
+	 */
+	static const vector<string> getAllMethodNamesSorted(MiniScript* miniScript);
+
+	/**
+	 * Get all method names by class name
 	 * @param miniScript MiniScript instance
 	 * @return all method names
 	 */