From 1aff2fcf1f56196ac224b9ea6aada32ce8aa45e5 Mon Sep 17 00:00:00 2001 From: Dedmen Miller Date: Fri, 7 May 2021 12:52:58 +0200 Subject: [PATCH] Fixed Lua ScriptCompiler constructor not calling SetupCompiler --- sqfc.lua | 5 +++-- src/luaHandler.cpp | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sqfc.lua b/sqfc.lua index 5a71a0e..a7859fc 100644 --- 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 index 4c1ebb3..9172ada 100644 --- a/src/luaHandler.cpp +++ b/src/luaHandler.cpp @@ -219,7 +219,13 @@ LuaHandler::LuaHandler() { lua.new_usertype( - "ScriptCompiler", sol::default_constructor, + "ScriptCompiler", sol::no_constructor, + "new", []() + { + ScriptCompiler compiler; + GLuaHandler.SetupCompiler(compiler); + return compiler; + }, "InitIncludePaths", [](ScriptCompiler& comp, sol::table paths) {