updatelibs: yaaa, thats it, lets test

andreasdr · Jan 3, 2025 · e0ee951 · e0ee951
1 parent 2395b6c
commit e0ee951
Show file tree

Hide file tree

Showing 20 changed files with 62 additions and 848 deletions.
diff --git a/Makefile b/Makefile
@@ -178,7 +178,7 @@ ifeq ($(GLES2), YES)
 endif 
 
 # subdirs
-LIBS:= $(LIBS) subdirs
+LIBS:= $(LIBS) make-subdirs
 
 SRC = src
 TINYXML = tinyxml
@@ -1054,11 +1054,18 @@ $(VULKAN_RENDERER_LIB_OBJS):$(OBJ)/%.o: $(SRC)/%.cpp | print-opts
 $(OPENGLES2_RENDERER_LIB_OBJS):$(OBJ)/%.o: $(SRC)/%.cpp | print-opts
 	$(cpp-command)
 
-subdirs:
+clean-subdirs:
 	@mkdir -p lib
 	for dir in $(SUBDIRS); do \
 		cd ext/$$dir; \
 		$(MAKE) clean; \
+		cd ../..; \
+    done
+
+make-subdirs:
+	@mkdir -p lib
+	for dir in $(SUBDIRS); do \
+		cd ext/$$dir; \
 		$(MAKE); \
 		cd ../..; \
 		cp ext/$$dir/lib/lib$$dir$(LIB_EXT) lib/; \
@@ -1155,7 +1162,7 @@ endif
 	@echo Done $@
 
 ifeq ($(OSSHORT), Msys)
-$(MAINS):$(BIN)/%:$(SRC)/%-main.cpp $(LIBS)
+$(MAINS):$(BIN)/%:$(SRC)/%-main.cpp
 	@mkdir -p $(dir $@);
 	@scripts/windows-mingw-create-executable-rc.sh "$<" $@.rc
 	@windres $@.rc -o coff -o $@.rc.o
@@ -1172,13 +1179,13 @@ mains: $(MAINS)
 
 all: mains
 
-clean:
+clean: clean-subdirs
 	rm -rf obj obj-debug $(LIB_DIR) $(BIN)
 
 print-opts:
 	@echo Building with \"$(CXX) $(CPPFLAGS) $(CXXFLAGS)\"
 
-.PHONY: all mains clean print-opts
+.PHONY: all $(LIBS) mains clean print-opts
 
 -include $(OBJS:%.o=%.d)
 -include $(OBJS_DEBUG:%.o=%.d)
diff --git a/ext/minitscript/src/minitscript/minitscript/MinitScript.cpp b/ext/minitscript/src/minitscript/minitscript/MinitScript.cpp
@@ -4798,7 +4798,7 @@ const MinitScript::Variable MinitScript::initializeMapSet(const string& scriptFi
 		lc = lc == '\\' && c == '\\'?'\0':c;
 	}
 	// convert to set if no values given
-	if (hasValues == false) {
+	if (hasValues == false && variable.getMapSize() > 0) {
 		Variable setVariable;
 		setVariable.setType(TYPE_SET);
 		const auto& mapValueReference = variable.getMapValueReference();
@@ -5086,8 +5086,8 @@ inline const MinitScript::Variable MinitScript::initializeVariable(const Variabl
 		case TYPE_ARRAY:
 			{
 				Variable arrayVariable;
-				//
 				arrayVariable.setType(TYPE_ARRAY);
+				//
 				auto arrayPointer = variable.getArrayPointer();
 				if (arrayPointer == nullptr) break;
 				for (const auto arrayEntry: *arrayPointer) {
@@ -5099,6 +5099,7 @@ inline const MinitScript::Variable MinitScript::initializeVariable(const Variabl
 		case TYPE_MAP:
 			{
 				Variable mapVariable;
+				mapVariable.setType(TYPE_MAP);
 				//
 				auto mapPointer = variable.getMapPointer();
 				if (mapPointer == nullptr) break;

diff --git a/ext/minitscript/src/minitscript/minitscript/MinitScript.h b/ext/minitscript/src/minitscript/minitscript/MinitScript.h
@@ -2425,11 +2425,11 @@ class minitscript::minitscript::MinitScript {
 			} else
 			if (StringTools::viewStartsWith(value, "{") == true &&
 				StringTools::viewEndsWith(value, "}") == true) {
-				*this = initializeMapSet(scriptFileName, value, minitScript, scriptIdx, statement);
+				setValue(initializeMapSet(scriptFileName, value, minitScript, scriptIdx, statement));
 			} else
 			if (StringTools::viewStartsWith(value, "[") == true &&
 				StringTools::viewEndsWith(value, "]") == true) {
-				*this = initializeArray(scriptFileName, value, minitScript, scriptIdx, statement);
+				setValue(initializeArray(scriptFileName, value, minitScript, scriptIdx, statement));
 			} else
 			if (viewIsFunctionAssignment(value, functionOrStacklet) == true) {
 				setFunctionAssignment(string(functionOrStacklet));

diff --git a/ext/minitscript/src/minitscript/minitscript/ScriptMethods.cpp b/ext/minitscript/src/minitscript/minitscript/ScriptMethods.cpp
@@ -487,6 +487,29 @@ void ScriptMethods::registerMethods(MinitScript* minitScript) {
 		};
 		minitScript->registerMethod(new MethodScriptStop(minitScript));
 	}
+	{
+		//
+		class MethodScriptGetGlobalVariables: public MinitScript::Method {
+		private:
+			MinitScript* minitScript { nullptr };
+		public:
+			MethodScriptGetGlobalVariables(MinitScript* minitScript): MinitScript::Method({}, MinitScript::TYPE_MAP), minitScript(minitScript) {}
+			const string getMethodName() override {
+				return "script.getGlobalVariables";
+			}
+			void executeMethod(span<MinitScript::Variable>& arguments, MinitScript::Variable& returnValue, const MinitScript::SubStatement& subStatement) override {
+				if (arguments.size() == 0) {
+					returnValue.setType(MinitScript::TYPE_MAP);
+					for (const auto& [variableName, variableValue]: minitScript->getRootScriptState().variables) {
+						returnValue.setMapEntry(variableName, *variableValue);
+					}
+				} else {
+					MINITSCRIPT_METHODUSAGE_COMPLAIN(getMethodName());
+				}
+			}
+		};
+		minitScript->registerMethod(new MethodScriptGetGlobalVariables(minitScript));
+	}
 	{
 		//
 		class MethodScriptGetVariables: public MinitScript::Method {

diff --git a/ext/minitscript/src/minitscript/minitscript/Version.cpp b/ext/minitscript/src/minitscript/minitscript/Version.cpp
@@ -9,7 +9,7 @@ using std::string;
 using minitscript::minitscript::Version;
 
 string Version::getVersion() {
-	return "0.9.33 PRE-BETA";
+	return "0.9.34 PRE-BETA";
 }
 
 string Version::getCopyright() {

diff --git a/resources/tests/scripts/advanced-test.tscript b/resources/tests/scripts/advanced-test.tscript