review fix

Author: Frotty

de.peeeq.wurstscript/src/main/antlr/de/peeeq/wurstscript/antlr/Wurst.g4

@@ -350,7 +350,7 @@ indexes:
 
 
 expr:
-		receiverTypeName=ID receiverTypeTypeArgs=typeArgsNonEmpty dotsTypeCall=('.'|'..') typeFuncName=ID? typeCallTypeArgs=typeArgs typeCallArgs=argumentList
+		receiverType=genericTypeReceiver dotsTypeCall=('.'|'..') typeFuncName=ID? typeCallTypeArgs=typeArgs typeCallArgs=argumentList
 	  | exprPrimary
 	  | left=expr 'castTo' castToType=typeExpr
 	  | left=expr 'instanceof' instaneofType=typeExpr
@@ -446,6 +446,22 @@ typeArgs: ('<' (args+=typeExpr (',' args+=typeExpr)*)? '>')?;
 
 typeArgsNonEmpty: '<' args+=typeExpr (',' args+=typeExpr)* '>';
 
+genericTypeReceiver:
+    receiverTypePrefixes+=genericTypeReceiverPrefixPart* receiverTypeGenericPart=genericTypeReceiverGenericPart receiverTypeSuffixes+=genericTypeReceiverSuffixPart*
+    ;
+
+genericTypeReceiverPrefixPart:
+    typeName=ID typeArgs '.'
+    ;
+
+genericTypeReceiverGenericPart:
+    typeName=ID typeArgsNonEmpty
+    ;
+
+genericTypeReceiverSuffixPart:
+    '.' typeName=ID typeArgs
+    ;
+
 exprList : exprs+=expr (',' exprs+=expr)*;
 
 

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/parser/antlr/AntlrWurstParseTreeTransformer.java

@@ -1097,8 +1097,7 @@ private Expr transformExpr(ExprContext e) {
                 return Ast.ExprCast(source, transformTypeExpr(e.castToType),
                         transformExpr(e.left));
             } else if (e.dotsTypeCall != null) {
-                TypeExpr receiverType = Ast.TypeExprSimple(source(e.receiverTypeName),
-                        Ast.NoTypeExpr(), e.receiverTypeName.getText(), transformTypeArgs(e.receiverTypeTypeArgs));
+                TypeExpr receiverType = transformGenericTypeReceiver(e.receiverType);
                 Expr left = Ast.ExprTypeRef(receiverType.getSource(), receiverType);
                 return transformMemberMethodCall2(source, left, e.dotsTypeCall,
                         e.typeFuncName, e.typeCallTypeArgs, e.typeCallArgs);
@@ -1131,6 +1130,30 @@ private Expr transformExpr(ExprContext e) {
 
     }
 
+    private TypeExpr transformGenericTypeReceiver(GenericTypeReceiverContext receiverType) {
+        OptTypeExpr scopeType = Ast.NoTypeExpr();
+        TypeExpr result = null;
+
+        for (GenericTypeReceiverPrefixPartContext part : receiverType.receiverTypePrefixes) {
+            result = Ast.TypeExprSimple(source(part.typeName), scopeType,
+                    part.typeName.getText(), transformTypeArgs(part.typeArgs()));
+            scopeType = result;
+        }
+
+        GenericTypeReceiverGenericPartContext genericPart = receiverType.receiverTypeGenericPart;
+        result = Ast.TypeExprSimple(source(genericPart.typeName), scopeType,
+                genericPart.typeName.getText(), transformTypeArgs(genericPart.typeArgsNonEmpty()));
+        scopeType = result;
+
+        for (GenericTypeReceiverSuffixPartContext part : receiverType.receiverTypeSuffixes) {
+            result = Ast.TypeExprSimple(source(part.typeName), scopeType,
+                    part.typeName.getText(), transformTypeArgs(part.typeArgs()));
+            scopeType = result;
+        }
+
+        return result;
+    }
+
     private int beginPos(ParseTree left) {
         if (left instanceof ParserRuleContext) {
             ParserRuleContext left2 = (ParserRuleContext) left;

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

@@ -1438,6 +1438,29 @@ public void genericStaticArray_staticMethods_specializedTypeReceiver_runtime() {
         );
     }
 
+    @Test
+    public void genericStaticArray_staticMethods_qualifiedSpecializedTypeReceiver_runtime() {
+        testAssertOkLines(true,
+            "package test",
+            "    native testSuccess()",
+            "    class Outer",
+            "        static 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 v) returns T",
+            "                return v",
+            "    init",
+            "        Outer.Box<int>.put(1, 42)",
+            "        Outer.Box<real>.put(1, 2.5)",
+            "        if Outer.Box<int>.get(1) == 42 and Outer.Box<int>.same(13) == 13 and Outer.Box<real>.get(1) == 2.5 and Outer.Box<real>.same(3.5) == 3.5",
+            "            testSuccess()",
+            "endpackage"
+        );
+    }
+
     @Test
     public void genericStaticTuple_runtime() {
         testAssertOkLines(true,