WIP generic updates

Author: Frotty

de.peeeq.wurstscript/parserspec/jass_im.parseq

@@ -142,6 +142,7 @@ ImConst =
 	| ImBoolVal(boolean valB)
 	| ImFuncRef(@ignoreForEquality de.peeeq.wurstscript.ast.Element trace, ref ImFunction func)
 	| ImNull(ref ImType type)
+	| ImTypeRef(@ignoreForEquality de.peeeq.wurstscript.ast.Element trace, ref ImClassType clazz)
 
 ImTypeArguments * ImTypeArgument
 

de.peeeq.wurstscript/parserspec/wurstscript.parseq

@@ -188,6 +188,7 @@ Expr =
 	| ExprDestroy(@ignoreForEquality de.peeeq.wurstscript.parser.WPos source, Expr destroyedObj)
 	| ExprIfElse(@ignoreForEquality de.peeeq.wurstscript.parser.WPos source, Expr cond, Expr ifTrue, Expr ifFalse)
 	| ExprArrayLength(@ignoreForEquality de.peeeq.wurstscript.parser.WPos source, Expr array)
+	| ExprTypeRef(@ignoreForEquality de.peeeq.wurstscript.parser.WPos source, TypeExpr typ)
 
 ExprMember =
 	  ExprMemberVar

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

@@ -347,6 +347,9 @@ indexes:
 		   '[' expr ']'
 	   ;
 
+exprTypeRef
+    : typeName=ID typeArgsNonEmpty
+    ;
 
 expr:
 		exprPrimary	
@@ -368,12 +371,14 @@ expr:
 	;
 
 
+
 exprPrimary:
 	    exprFunctionCall
       | exprNewObject
 	  | exprClosure
 	  | exprStatementsBlock
 	  | exprDestroy
+	  | exprTypeRef
       | varname=ID indexes?
       | atom=(INT
       | REAL
@@ -438,6 +443,9 @@ stmtBreak:'break';
 stmtSkip:'skip';
 
 
+typeArgsNonEmpty
+    : '<' (args+=typeExpr (',' args+=typeExpr)*)? '>'
+    ;
 
 typeArgs: ('<' (args+=typeExpr (',' args+=typeExpr)*)? '>')?;
 

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/HoverInfo.java

@@ -782,6 +782,11 @@ public List<Either<String, MarkedString>> case_VisibilityPublic(VisibilityPublic
             return string("This element can be used everywhere");
         }
 
+        @Override
+        public List<Either<String, MarkedString>> case_ExprTypeRef(ExprTypeRef exprTypeRef) {
+            return List.of();
+        }
+
         @Override
         public List<Either<String, MarkedString>> case_TopLevelDeclarations(TopLevelDeclarations topLevelDeclarations) {
             return string("A list of declarations.");

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/WurstParser.java

@@ -112,7 +112,9 @@ public void syntaxError(@SuppressWarnings("null") Recognizer<?, ?> recognizer, @
             parser.removeErrorListeners();
             parser.addErrorListener(l);
 
+            parser.setBuildParseTree(true);
             CompilationUnitContext cu = parser.compilationUnit(); // begin parsing at init rule
+            System.out.println(cu.toStringTree(parser));
 
             if (lexer.getTabWarning() != null) {
                 CompileError warning = lexer.getTabWarning();

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

@@ -5,23 +5,30 @@
 import de.peeeq.wurstscript.ast.ExprMemberMethod;
 import de.peeeq.wurstscript.ast.ExprNewObject;
 import de.peeeq.wurstscript.types.CallSignature;
+import de.peeeq.wurstscript.types.WurstType;
 
 public class AttrCallSignature {
 
     public static CallSignature calculate(ExprFunctionCall c) {
-        Expr receiver = null;
-        if (c.attrImplicitParameter() instanceof Expr) {
-            receiver = (Expr) c.attrImplicitParameter();
-        }
-        return new CallSignature(receiver, c.getArgs());
+        Expr receiver = (c.attrImplicitParameter() instanceof Expr) ? (Expr) c.attrImplicitParameter() : null;
+        WurstType hint = receiver != null ? receiver.attrTyp() : null;
+        return new CallSignature(receiver, hint, c.getArgs());
     }
 
     public static CallSignature calculate(ExprMemberMethod c) {
-        return new CallSignature(c.attrImplicitParameter(), c.getArgs());
+        // Always keep the instantiated left type as hint (e.g. OtherBox<int>)
+        WurstType hint = c.getLeft().attrTyp();
+
+        if (c.getLeft().attrTyp().isStaticRef()) {
+            // static ref like OtherBox<int>.staticItr()
+            return new CallSignature(null, hint, c.getArgs());
+        }
+
+        // instance call: keep real receiver expression AND hint
+        return new CallSignature(c.attrImplicitParameter(), hint, c.getArgs());
     }
 
     public static CallSignature calculate(ExprNewObject c) {
-        return new CallSignature(null, c.getArgs());
+        return new CallSignature((Expr) null, null, c.getArgs());
     }
-
 }

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

@@ -591,4 +591,8 @@ public static WurstType calculate(ExprArrayLength exprArrayLength) {
         exprArrayLength.addError(".length is only valid on arrays.");
         return de.peeeq.wurstscript.types.WurstTypeUnknown.instance();
     }
+
+    public static WurstType calculate(ExprTypeRef e) {
+        return e.getTyp().attrTyp();
+    }
 }

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

@@ -9,7 +9,7 @@
 public class AttrImplicitParameter {
 
     public static OptExpr getImplicitParameter(ExprMemberVar e) {
-        Expr result = getImplicitParameterUsingLeft(e);
+        Expr result = getImplicitParameterUsingLeft(e, true); // keep static refs
         if (result == null) {
             return getImplicitParamterCaseNormalVar(e);
         } else {
@@ -18,7 +18,7 @@ public static OptExpr getImplicitParameter(ExprMemberVar e) {
     }
 
     public static OptExpr getImplicitParameter(ExprMemberArrayVar e) {
-        Expr result = getImplicitParameterUsingLeft(e);
+        Expr result = getImplicitParameterUsingLeft(e, true); // keep static refs
         if (result == null) {
             return getImplicitParamterCaseNormalVar(e);
         } else {
@@ -40,7 +40,7 @@ public static OptExpr getImplicitParameter(ExprFunctionCall e) {
     }
 
     public static OptExpr getImplicitParameter(ExprMemberMethod e) {
-        Expr result = getImplicitParameterUsingLeft(e);
+        Expr result = getImplicitParameterUsingLeft(e, false);
         if (result == null) {
             return getImplicitParameterCaseNormalFunctionCall(e);
         } else {
@@ -55,14 +55,19 @@ public static OptExpr getImplicitParameter(ExprMemberMethod e) {
         }
     }
 
-    private static @Nullable Expr getImplicitParameterUsingLeft(HasReceiver e) {
-        if (e.getLeft().attrTyp().isStaticRef()) {
-            // we have a static ref like Math.sqrt()
-            // this will be handled like if we just have sqrt()
-            // if we have an implicit parameter depends on whether sqrt is static or not
+    private static @Nullable Expr getImplicitParameterUsingLeft(HasReceiver e, boolean keepStaticRef) {
+        Expr left = e.getLeft();
+
+        if (left.attrTyp().isStaticRef()) {
+            // Only keep typed refs like Box<int> so we can specialize generics.
+            // Plain identifiers like BoxInt must NOT become runtime receivers.
+            if (keepStaticRef && left instanceof ExprTypeRef) {
+                return left;
+            }
             return null;
         }
-        return e.getLeft();
+
+        return left;
     }
 
     private static OptExpr getImplicitParameterCaseNormalFunctionCall(FunctionCall e) {
@@ -71,12 +76,19 @@ private static OptExpr getImplicitParameterCaseNormalFunctionCall(FunctionCall e
     }
 
     static OptExpr getFunctionCallImplicitParameter(FunctionCall e, FuncLink calledFunc, boolean showError) {
-        if (e instanceof HasReceiver) {
-            HasReceiver hasReceiver = (HasReceiver) e;
-            Expr res = getImplicitParameterUsingLeft(hasReceiver);
-            if (res != null) {
-                return res;
+        if (e instanceof HasReceiver hasReceiver) {
+            Expr left = hasReceiver.getLeft();
+
+            if (left.attrTyp().isStaticRef()) {
+                // Keep ONLY typed static refs to propagate type args (Box<int>.foo()).
+                if (left instanceof ExprTypeRef) {
+                    return left; // type-only receiver
+                }
+                return Ast.NoExpr(); // plain BoxInt.foo() has no receiver
             }
+
+            // normal dynamic receiver
+            return left;
         }
         if (calledFunc == null) {
             return Ast.NoExpr();

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

@@ -425,4 +425,8 @@ public static String description(NoTypeParamConstraints noTypeParamConstraints)
     public static String description(ExprArrayLength exprArrayLength) {
         return "Get the length of an array.";
     }
+
+    public static String description(ExprTypeRef exprTypeRef) {
+        return null;
+    }
 }

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

@@ -205,4 +205,8 @@ public static ImmutableList<NameDef> calculate(ExprIfElse e) {
     public static ImmutableList<NameDef> calculate(ExprArrayLength exprArrayLength) {
         return ImmutableList.emptyList();
     }
+
+    public static ImmutableList<NameDef> calculate(ExprTypeRef exprTypeRef) {
+        return ImmutableList.emptyList();
+    }
 }