lua robustness

Author: Frotty

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

@@ -775,9 +775,12 @@ private boolean rewriteTypeCastingCompatFunction(ImFunction f, LuaFunction lf) {
         if (f.getParameters().isEmpty()) {
             return false;
         }
-        String tcFunc = f.getName();
-        ImVar p = f.getParameters().get(0);
-        LuaExpr arg = LuaAst.LuaExprVarAccess(luaVar.getFor(p));
+        String tcFunc = getTypeCastingFunctionName(f);
+        if (tcFunc == null) {
+            return false;
+        }
+        ImVar firstParam = f.getParameters().get(0);
+        LuaExpr arg = LuaAst.LuaExprVarAccess(luaVar.getFor(firstParam));
 
         if ("stringToIndex".equals(tcFunc)) {
             lf.getBody().clear();
@@ -805,17 +808,6 @@ private boolean rewriteTypeCastingCompatFunction(ImFunction f, LuaFunction lf) {
             lf.getBody().add(LuaAst.LuaReturn(LuaAst.LuaExprFunctionCall(fromIndexFunction, LuaAst.LuaExprlist(arg))));
             return true;
         }
-        // Final fallback for transformed/copied function names that may lose trace info:
-        if (tcFunc.endsWith("ToIndex")) {
-            lf.getBody().clear();
-            lf.getBody().add(LuaAst.LuaReturn(LuaAst.LuaExprFunctionCall(toIndexFunction, LuaAst.LuaExprlist(arg))));
-            return true;
-        }
-        if (tcFunc.endsWith("FromIndex")) {
-            lf.getBody().clear();
-            lf.getBody().add(LuaAst.LuaReturn(LuaAst.LuaExprFunctionCall(fromIndexFunction, LuaAst.LuaExprlist(arg))));
-            return true;
-        }
         return false;
     }
 
@@ -1100,13 +1092,6 @@ public String getTypeCastingFunctionName(ImFunction f) {
                 return fd.getName();
             }
         }
-        // Fallback: transformed/copied IM functions may lose package trace metadata.
-        // Keep Lua behavior stable by routing canonical *ToIndex/*FromIndex names anyway.
-        String name = f.getName();
-        if ("stringToIndex".equals(name) || "stringFromIndex".equals(name)
-            || name.endsWith("ToIndex") || name.endsWith("FromIndex")) {
-            return name;
-        }
         return null;
     }
 }

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/validation/WurstValidator.java

@@ -1229,7 +1229,10 @@ private boolean refersToSameVar(OptExpr a, OptExpr b) {
             NameRef vb = (NameRef) b;
             NameLink nla = va.attrNameLink();
             NameLink nlb = vb.attrNameLink();
-            if (nla != null && nlb != null && nla.getDef() == nlb.getDef()
+            if (nla != null && nlb != null
+                    && !(nla instanceof OtherLink)
+                    && !(nlb instanceof OtherLink)
+                    && nla.getDef() == nlb.getDef()
                     && refersToSameVar(va.attrImplicitParameter(), vb.attrImplicitParameter())) {
                 if (va instanceof AstElementWithIndexes && vb instanceof AstElementWithIndexes) {
                     AstElementWithIndexes vai = (AstElementWithIndexes) va;

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

@@ -124,6 +124,20 @@ public void closure_selfReference_withIt_isReadOnly() {
                 "    end");
     }
 
+    @Test
+    public void closure_selfReference_withIt_assignmentNoCrash() {
+        testAssertOkLines(false,
+                "package test",
+                "interface IntFunc",
+                "    function apply(int x) returns int",
+                "init",
+                "    IntFunc f = (int n) -> begin",
+                "        IntFunc x = it",
+                "        x = it",
+                "        return n",
+                "    end");
+    }
+
     @Test
     public void closure_begin_end1() {
         testAssertOkLines(true,

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

@@ -439,6 +439,30 @@ public void objectIndexFunctionsDoNotCollideWithUserFunctions() throws IOExcepti
         assertFunctionBodyContains(compiled, "testClass", "__wurst_objectFromIndex", true);
     }
 
+    @Test
+    public void tupleReturningMethodNamedFromIndexIsNotTypecastWrapper() throws IOException {
+        test().testLua(true).lines(
+            "package TupleFromIndexRepro",
+            "public tuple vec2(real x, real y)",
+            "public tuple searchResult(boolean found, vec2 pos)",
+            "public constant ZERO2 = vec2(0., 0.)",
+            "public class A",
+            "    function next() returns searchResult",
+            "        return nextFromIndex(1)",
+            "    function nextFromIndex(int startIndex) returns searchResult",
+            "        return searchResult(false, ZERO2)",
+            "public class B extends A",
+            "init",
+            "    let b = new B()",
+            "    let r = b.next()",
+            "    if r.found",
+            "        skip"
+        );
+        String compiled = Files.toString(new File("test-output/lua/LuaTranslationTests_tupleReturningMethodNamedFromIndexIsNotTypecastWrapper.lua"), Charsets.UTF_8);
+        assertContainsRegex(compiled, "function\\s+[^\\n]*nextFromIndex[^\\n]*\\(");
+        assertDoesNotContainRegex(compiled, "return\\s+__wurst_objectFromIndex\\s*\\(\\s*this\\s*\\)");
+    }
+
     @Test
     public void oldGenericsCastingDoesNotUseGetHandleId() throws IOException {
         test().testLua(true).withStdLib().lines(