review fix

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/AttrPossibleFunctionSignatures.java

@@ -37,7 +37,7 @@ public static ImmutableCollection<FunctionSignature> calculate(FunctionCall fc)
                 }
             } // TODO else check?
 
-            VariableBinding mapping = givenBinding(fc, sig.getDefinitionTypeVariables());
+            VariableBinding mapping = sig.getMapping().union(givenBinding(fc, sig.getDefinitionTypeVariables()));
             sig = sig.setTypeArgs(fc, mapping);
 
             resultBuilder.add(sig);
@@ -229,7 +229,7 @@ public static ImmutableCollection<FunctionSignature> calculate(ExprMemberMethod
             }
 
             // Apply explicit type args from the call-site (e.g., c.foo<T,...>(...))
-            VariableBinding explicit = GenericsHelper.givenBinding(mm, sig.getDefinitionTypeVariables());
+            VariableBinding explicit = sig.getMapping().union(GenericsHelper.givenBinding(mm, sig.getDefinitionTypeVariables()));
             sig = sig.setTypeArgs(mm, explicit);
 
             prepared.add(sig);

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

@@ -113,6 +113,36 @@ private static boolean hasTypeVarNamed(ImTypeVars vars, String name) {
         return false;
     }
 
+    private static String uniqueTypeVarName(ImTypeVars vars, TypeParamDef tp) {
+        String name = tp.getName();
+        if (!hasTypeVarNamed(vars, name)) {
+            return name;
+        }
+
+        String baseName = name + "$" + typeParamOwnerName(tp);
+        String candidate = baseName;
+        int suffix = 2;
+        while (hasTypeVarNamed(vars, candidate)) {
+            candidate = baseName + suffix;
+            suffix++;
+        }
+        return candidate;
+    }
+
+    private static String typeParamOwnerName(TypeParamDef tp) {
+        de.peeeq.wurstscript.ast.Element e = tp.getParent();
+        while (e != null) {
+            if (e instanceof FuncDef) {
+                return ((FuncDef) e).getName();
+            }
+            if (e instanceof NamedScope) {
+                return ((NamedScope) e).getName();
+            }
+            e = e.getParent();
+        }
+        return "type";
+    }
+
     public Map<TypeParamDef, ImTypeVar> getTypeVarOverridesForClass(ClassDef cd) {
         Map<TypeParamDef, ImTypeVar> m = capturedOwnerTypeVarsByStaticClass.get(cd);
         return (m == null) ? Collections.emptyMap() : m;
@@ -1027,11 +1057,7 @@ private void handleTypeParameters(TypeParamDefs tps) {
 
             private void handleTypeParameter(TypeParamDef tp) {
                 if (tp.getTypeParamConstraints() instanceof TypeExprList) {
-                    ImTypeVar base = typeVariable.getFor(tp);
-                    if (hasTypeVarNamed(typeVars, base.getName())) {
-                        return;
-                    }
-                    ImTypeVar v = JassIm.ImTypeVar(base.getName());
+                    ImTypeVar v = JassIm.ImTypeVar(uniqueTypeVarName(typeVars, tp));
                     typeVariableReverse.put(v, tp);
                     typeVars.add(v);
                 }

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

@@ -1461,6 +1461,27 @@ public void genericStaticArray_staticMethods_qualifiedSpecializedTypeReceiver_ru
         );
     }
 
+    @Test
+    public void genericStaticArray_staticMethodShadowedTypeParam_runtime() {
+        testAssertOkLines(true,
+            "package test",
+            "    native testSuccess()",
+            "    class Box<T:>",
+            "        private static T array store",
+            "        static function put(int i, T v)",
+            "            store[i] = v",
+            "        static function get(int i) returns T",
+            "            return store[i]",
+            "        static function same<T:>(T v) returns T",
+            "            return v",
+            "    init",
+            "        Box<int>.put(1, 42)",
+            "        if Box<int>.get(1) == 42 and Box<int>.same<real>(1.5) == 1.5",
+            "            testSuccess()",
+            "endpackage"
+        );
+    }
+
     @Test
     public void genericStaticTuple_runtime() {
         testAssertOkLines(true,