Normalize generic values used as Lua indices

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/translation/imtranslation/ExprTranslation.java

@@ -140,7 +140,19 @@ static ImExpr wrapLua(Element trace, ImTranslator t, ImExpr translated, WurstTyp
         return translated;
     }
 
-    static ImExpr wrapTranslation(Element trace, ImTranslator t, ImExpr translated, WurstType actualType, WurstType expectedTypRaw) {
+    static ImExpr wrapTranslation(Expr e, ImTranslator t, ImExpr translated, WurstType actualType, WurstType expectedTypRaw) {
+        return wrapTranslation(e, t, translated, actualType, expectedTypRaw,
+            e.getParent() instanceof Indexes);
+    }
+
+    static ImExpr wrapTranslation(Element trace, ImTranslator t, ImExpr translated,
+                                  WurstType actualType, WurstType expectedTypRaw) {
+        return wrapTranslation(trace, t, translated, actualType, expectedTypRaw, false);
+    }
+
+    private static ImExpr wrapTranslation(Element trace, ImTranslator t, ImExpr translated,
+                                          WurstType actualType, WurstType expectedTypRaw,
+                                          boolean indexContext) {
         ImFunction toIndex = null;
         ImFunction fromIndex = null;
         if (actualType instanceof WurstTypeBoundTypeParam) {
@@ -184,7 +196,7 @@ static ImExpr wrapTranslation(Element trace, ImTranslator t, ImExpr translated,
         if (actualType instanceof WurstTypeBoundTypeParam
             && !(expectedTypRaw instanceof WurstTypeBoundTypeParam)
             && !(expectedTypRaw instanceof WurstTypeTypeParam)
-            && isPrimitiveType(expectedTypRaw)) {
+            && (isPrimitiveType(expectedTypRaw) || indexContext)) {
             return wrapLua(trace, t, translated, actualType);
         }
         return translated;

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/translation/imtranslation/LuaNativeLowering.java

@@ -379,8 +379,8 @@ public void visit(ImFunctionCall call) {
                     }
                     ImExpr normalized;
                     if (ensure == translator.ensureBoolFunc) {
-                        normalized = JassIm.ImOperatorCall(WurstOperator.NOTEQ,
-                            JassIm.ImExprs(argument.copy(), JassIm.ImNull(JassIm.ImAnyType())));
+                        normalized = JassIm.ImOperatorCall(WurstOperator.EQ,
+                            JassIm.ImExprs(argument.copy(), JassIm.ImBoolVal(true)));
                     } else {
                         normalized = JassIm.ImFunctionCall(call.attrTrace(), ensure,
                             JassIm.ImTypeArguments(), JassIm.ImExprs(argument.copy()), false, CallType.NORMAL);

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

@@ -2201,12 +2201,14 @@ public void erasedGenericPrimitiveDefaultsAreNormalizedAtConcreteUse() throws IO
         test().testLua(true).executeProg().lines(
             "package Test",
             "native testSuccess()",
+            "int array values",
             "class Box<T:>",
             "    T value",
             "    function get() returns T",
             "        return value",
             "init",
             "    let box = new Box<int>",
+            "    values[box.get()] = 7",
             "    if box.get() + 1 == 1",
             "        testSuccess()"
         );