Fixed Lua ScriptCompiler constructor not calling SetupCompiler

dedmen · May 7, 2021 · 1aff2fc · 1aff2fc
1 parent 1999555
commit 1aff2fc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/sqfc.lua b/sqfc.lua
@@ -96,7 +96,7 @@ compiler:AddMacro(Macro.new("MY_MACRO_CUSTOM_ARGS", {"arg1", "arg2"},
     end
 ));
 
-print("Preprocessed Script: \n", compiler:PreprocessFile(path.new("P:/test.sqf")));
+-- print("Preprocessed Script: \n", compiler:PreprocessFile(path.new("P:\\test.sqf")));
 
 
 function optimizerNodeHandler(node)
@@ -163,5 +163,6 @@ end
 local optimizer = OptimizerModuleLua.new(optimizerNodeHandler)
 
 
-compiler:CompileScriptToFile(path.new("P:/test.sqf"), path.new("P:/test.asm"), optimizer)
+--compiler:CompileScriptToFile(path.new("P:\\test.sqf"), path.new("P:/test.asm"), optimizer)
+compiler:CompileScriptToFile(path.new("T:\\z\\ace\\addons\\common\\functions\\fnc_cbaSettings_loadFromConfig.sqf"), path.new("P:/test.asm"), optimizer)
 
diff --git a/src/luaHandler.cpp b/src/luaHandler.cpp
@@ -219,7 +219,13 @@ LuaHandler::LuaHandler() {
 
 
     lua.new_usertype<ScriptCompiler>(
-        "ScriptCompiler", sol::default_constructor,
+        "ScriptCompiler", sol::no_constructor,
+        "new", []()
+        {
+            ScriptCompiler compiler;
+            GLuaHandler.SetupCompiler(compiler);
+            return compiler;
+        },
 
         "InitIncludePaths", [](ScriptCompiler& comp, sol::table paths)
         {