fix build

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/translation/lua/translation/LuaTranslator.java

@@ -12,9 +12,6 @@
 import de.peeeq.wurstscript.utils.Utils;
 import org.jetbrains.annotations.NotNull;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
 import java.util.*;
 import java.util.stream.Stream;
 
@@ -974,7 +971,7 @@ private int classDistance(ImClass from, ImClass to) {
     }
 
     private void debugDispatchGroup(ImClass receiverClass, String key, Set<String> slotNames, List<ImMethod> groupMethods, ImMethod chosen) {
-        if (!DEBUG_LUA_DISPATCH && !isSuspiciousGroup(slotNames, groupMethods, chosen)) {
+        if (!DEBUG_LUA_DISPATCH) {
             return;
         }
         String chosenImpl = chosen != null && chosen.getImplementation() != null ? chosen.getImplementation().getName() : "null";
@@ -988,38 +985,12 @@ private void debugDispatchGroup(ImClass receiverClass, String key, Set<String> s
             }
             candidates.append(m.getName()).append("->").append(impl).append("@").append(classSortKey(m.attrClass()));
         }
-        System.err.println("[LuaDispatch] class=" + classSortKey(receiverClass)
+        String line = "[LuaDispatch] class=" + classSortKey(receiverClass)
             + " key=" + key
             + " slots=" + slotNames
             + " chosen=" + chosenImpl
-            + " candidates=[" + candidates + "]");
-        if (DEBUG_LUA_DISPATCH) {
-            String line = "[LuaDispatch] class=" + classSortKey(receiverClass)
-                + " key=" + key
-                + " slots=" + slotNames
-                + " chosen=" + chosenImpl
-                + " candidates=[" + candidates + "]"
-                + System.lineSeparator();
-            try {
-                Files.writeString(Path.of("C:/Users/Frotty/Documents/GitHub/WurstScript/lua-dispatch-debug.log"),
-                    line, StandardOpenOption.CREATE, StandardOpenOption.APPEND);
-            } catch (Exception ignored) {
-            }
-        }
-    }
-
-    private boolean isSuspiciousGroup(Set<String> slotNames, List<ImMethod> groupMethods, ImMethod chosen) {
-        if (slotNames.size() > 1) {
-            return true;
-        }
-        boolean hasNonNoOp = false;
-        for (ImMethod m : groupMethods) {
-            if (!isNoOpImplementation(m) && m.getImplementation() != null) {
-                hasNonNoOp = true;
-                break;
-            }
-        }
-        return hasNonNoOp && isNoOpImplementation(chosen);
+            + " candidates=[" + candidates + "]";
+        WLogger.trace(line);
     }
 
     private String methodSortKey(ImMethod m) {

de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/LuaTranslationTests.java

@@ -141,10 +141,16 @@ private List<String> subclassCreateClasses(String output, String baseName) {
     }
 
     private String compileLuaWithRunArgs(String testName, boolean withStdLib, String... lines) {
+        return compileLuaWithCUs(testName, withStdLib, Collections.emptyList(), lines);
+    }
+
+    private String compileLuaWithCUs(String testName, boolean withStdLib, List<CU> extraCUs, String... lines) {
         RunArgs runArgs = new RunArgs().with("-lua", "-inline", "-localOptimizations", "-stacktraces");
         WurstGui gui = new WurstGuiCliImpl();
         WurstCompilerJassImpl compiler = new WurstCompilerJassImpl(null, gui, null, runArgs);
-        List<CU> inputs = Collections.singletonList(new CU(testName + ".wurst", String.join("\n", lines)));
+        List<CU> inputs = new ArrayList<>();
+        inputs.addAll(extraCUs);
+        inputs.add(new CU(testName + ".wurst", String.join("\n", lines)));
 
         WurstModel model = parseFiles(Collections.emptyList(), inputs, withStdLib, compiler);
         assertNotNull("parse returned null model, errors = " + gui.getErrorList(), model);
@@ -2316,22 +2322,26 @@ public void wurstInternalNativesDoNotGetNilSafetyWrapper() throws IOException {
     }
 
     @Test
-    public void isLuaMagicConstantIsTrueInLuaMode() throws IOException {
-        // isLua must be inlined to true in Lua mode by GlobalsInliner,
-        // so backend-specific code paths can be selected at compile time.
-        test().testLua(true).withStdLib().lines(
+    public void isLuaMagicConstantIsTrueInLuaMode() {
+        // isLua must be replaced with true by LuaNativeLowering so the optimizer can
+        // prune Jass-only branches at compile time. This test does NOT use withStdLib()
+        // to avoid dependence on the stdlib version pin in StdLib.java.
+        CU magicFunctions = new CU("MagicFunctions.wurst",
+            "package MagicFunctions\npublic constant isLua = false\n");
+        String compiled = compileLuaWithCUs(
+            "LuaTranslationTests_isLuaMagicConstantIsTrueInLuaMode",
+            false,
+            Collections.singletonList(magicFunctions),
             "package Test",
             "import MagicFunctions",
+            "native print(string s)",
             "init",
             "    if isLua",
             "        print(\"lua-path\")",
             "    else",
             "        print(\"jass-path\")"
         );
-        String compiled = Files.toString(
-            new File("test-output/lua/LuaTranslationTests_isLuaMagicConstantIsTrueInLuaMode.lua"),
-            Charsets.UTF_8);
-        // After inlining, the raw isLua variable must not appear in Lua output
+        // After LuaNativeLowering, all reads of MagicFunctions_isLua must be inlined to true
         assertFalse("MagicFunctions_isLua must be inlined away in Lua mode", compiled.contains("MagicFunctions_isLua"));
         // The lua-path branch must be preserved
         assertTrue("lua-path branch must be present", compiled.contains("lua-path"));