[WIP] Type classes

de.peeeq.wurstscript/build.gradle

@@ -213,11 +213,9 @@ compileJava.dependsOn gen
 
 test {
     // set minimal heap size required to run tests:
-    jvmArgs = ['-Xms256m']
+    maxHeapSize = "1G"
 
-    useTestNG() {
-        suites 'src/test/resources/AllTestsSuite.xml'
-    }
+    useTestNG()
 }
 
 // delete the generated sources on clean

de.peeeq.wurstscript/parserspec/jass_im.parseq

@@ -9,15 +9,14 @@ ImProg(
 	ImFunctions functions,
 	ImMethods methods,
 	ImClasses classes,
-	ImTypeClassFuncs typeClassFunctions,
 	java.util.Map<ImVar, java.util.List<ImExpr>> globalInits)
 
 ImVars * ImVar
 ImFunctions * ImFunction
 ImClasses * ImClass
-ImTypeClassFuncs * ImTypeClassFunc
 
-ImVar(@ignoreForEquality de.peeeq.wurstscript.ast.Element trace, ref ImType type, String name, boolean isBJ)
+ImVar(@ignoreForEquality de.peeeq.wurstscript.ast.Element trace, ref ImType type, String name,
+    java.util.List<de.peeeq.wurstscript.translation.imtranslation.VarFlag> varFlags)
 
 ImType = 
 	  ImSimpleType(String typename)
@@ -37,30 +36,28 @@ ImTypeVars * ImTypeVar
 
 ImTypeVar(String name)
 
-ImFunction(@ignoreForEquality de.peeeq.wurstscript.ast.Element trace, 
+ImFunction(@ignoreForEquality de.peeeq.wurstscript.ast.Element trace,
 	String name,
 	ImTypeVars typeVariables,
-	ImVars parameters, 
+	ImVars parameters,
 	ref ImType returnType, 
 	ImVars locals, 
 	ImStmts body, 
 	java.util.List<de.peeeq.wurstscript.translation.imtranslation.FunctionFlag> flags)
 
-ImTypeClassFunc(@ignoreForEquality de.peeeq.wurstscript.ast.Element trace,
-	String name,
-	ImTypeVars typeVariables,
-	ImVars parameters,
-	ref ImType returnType)
 
 
 ImClass(@ignoreForEquality de.peeeq.wurstscript.ast.Element trace, 
 	String name,
 	ImTypeVars typeVariables,
-	ImVars fields, 
+	ImVars fields,
 	ImMethods methods,
 	ImFunctions functions,
 	java.util.List<ImClassType> superClasses)
 
+
+ImElementWithTypeVars = ImFunction | ImClass
+
 ImMethods * ImMethod
 
 ImMethod(@ignoreForEquality de.peeeq.wurstscript.ast.Element trace,
@@ -100,10 +97,10 @@ ImExpr =
 	| ImGetStackTrace()
 	| ImCompiletimeExpr(@ignoreForEquality de.peeeq.wurstscript.ast.Element trace, ImExpr expr, int executionOrderIndex)
     | ImLExpr
-    | ImTypeVarDispatch(@ignoreForEquality de.peeeq.wurstscript.ast.Element trace, ref ImTypeClassFunc typeClassFunc, ImExprs arguments
-                       , ref ImTypeVar typeVariable)
 	| ImCast(ImExpr expr, ref ImType toType)
 
+
+
 // an expression which can be used on the left hand side of an assignment
 ImLExpr =
       ImVarAccess(ref ImVar var)
@@ -129,7 +126,7 @@ ImClassRelatedExprWithClass =
 	| ImInstanceof(ImExpr obj, ref ImClassType clazz)
 	| ImTypeIdOfObj(ImExpr obj, ref ImClassType clazz)
 	| ImTypeIdOfClass(ref ImClassType clazz)
-
+	| ImTypeClassDictValue(@ignoreForEquality de.peeeq.wurstscript.ast.Element trace, ref ImClassType clazz, ImExprs arguments)
 
 
 
@@ -148,7 +145,7 @@ ImConst =
 
 ImTypeArguments * ImTypeArgument
 
-ImTypeArgument(ref ImType type, java.util.Map<ImTypeClassFunc, io.vavr.control.Either<ImMethod, ImFunction>> typeClassBinding)
+ImTypeArgument(ref ImType type)
 
 // helper types:
 
@@ -380,3 +377,6 @@ ImLExpr.isUsedAsLValue()
     returns boolean
     implemented by de.peeeq.wurstscript.translation.imtranslation.LValues.isUsedAsLValue
 
+ImVar.isBJ()
+    returns boolean
+    implemented by de.peeeq.wurstscript.translation.imtranslation.VarFlag.isBj

de.peeeq.wurstscript/parserspec/wurstscript.parseq

@@ -36,6 +36,7 @@ WEntity =
 	| ModuleDef(@ignoreForEquality de.peeeq.wurstscript.parser.WPos source, Modifiers modifiers, Identifier nameId, TypeParamDefs typeParameters,
 			ClassDefs innerClasses, FuncDefs methods, GlobalVarDefs vars, ConstructorDefs constructors,
 			ModuleInstanciations p_moduleInstanciations, ModuleUses moduleUses, OnDestroyDef onDestroy)
+	| InstanceDecl(@ignoreForEquality de.peeeq.wurstscript.parser.WPos source, Modifiers modifiers, TypeParamDefs typeParameters, TypeExpr implementedInterface, FuncDefs methods)
 
 
 
@@ -117,7 +118,12 @@ TypeParamDefs * TypeParamDef
 
 TypeParamDef(@ignoreForEquality de.peeeq.wurstscript.parser.WPos source, Modifiers modifiers, Identifier nameId, TypeParamConstraints typeParamConstraints)
 
-TypeParamConstraints = NoTypeParamConstraints() | TypeExprList
+TypeParamConstraints = NoTypeParamConstraints() | TypeParamConstraintList
+
+TypeParamConstraintList * TypeParamConstraint
+
+TypeParamConstraint(TypeExpr constraint)
+
 
 
 WParameters * WParameter
@@ -282,6 +288,7 @@ WScope =
 	| WBlock
 	| WEntities
 	| ExprClosure
+	| InstanceDecl
 
 PackageOrGlobal = WPackage | CompilationUnit
 
@@ -310,7 +317,7 @@ Modifier =
 
 // ElementWithBody = FunctionImplementation | InitBlock | ConstructorDef | OnDestroyDef
 //ElementWithModifier = NameDef | TypeDef | ModuleDef | ConstructorDef | GlobalVarDef | FunctionDefinition
-HasModifier = NameDef | TypeDef | ModuleDef | ConstructorDef | GlobalVarDef | FunctionDefinition
+HasModifier = NameDef | TypeDef | ModuleDef | ConstructorDef | GlobalVarDef | FunctionDefinition | InstanceDecl
 HasTypeArgs =  ExprNewObject | FunctionCall | ModuleUse | StmtCall | TypeExprSimple
 
 AstElementWithFuncName = ExprFunctionCall | ExprMemberMethod | ExprFuncRefc
@@ -323,7 +330,7 @@ AstElementWithNameId = WPackage | NativeFunc | ModuleDef | TypeDef | ModuleInsta
 
 AstElementWithParameters = FunctionDefinition | ExtensionFuncDef | NativeFunc | TupleDef | ConstructorDef | FuncDef
 
-AstElementWithTypeParameters = ExtensionFuncDef | ModuleDef | ClassDef | InterfaceDef | FuncDef
+AstElementWithTypeParameters = ExtensionFuncDef | ModuleDef | ClassOrInterfaceOrInstance | FuncDef
 
 AstElementWithArgs = StmtCall | ExprFunctionCall | ExprNewObject | ExprMemberMethod
 
@@ -350,6 +357,8 @@ StructureDef = ClassOrModuleOrModuleInstanciation | ClassOrInterface
 
 ClassOrInterface = ClassDef | InterfaceDef
 
+ClassOrInterfaceOrInstance = ClassOrInterface | InstanceDecl
+
 ClassOrModuleInstanciation = ClassDef | ModuleInstanciation
 ClassOrModuleOrModuleInstanciation = ClassOrModule | ClassOrModuleInstanciation
 
@@ -506,6 +515,14 @@ Element.attrNearestScope()
 	returns @Nullable WScope
 	implemented by de.peeeq.wurstscript.attributes.AttrNearest.nearestScope
 
+TypeParamConstraint.parentTypeParam()
+    returns TypeParamDef
+    implemented by de.peeeq.wurstscript.attributes.AttrNearest.parentTypeParam
+
+TypeParamConstraint.attrConstraintTyp()
+    returns de.peeeq.wurstscript.types.WurstType
+    implemented by de.peeeq.wurstscript.attributes.AttrTypeExprType.constraintType
+
 WScope.attrNextScope "returns the scope surrounding this scope"
 	returns @Nullable WScope
 	implemented by de.peeeq.wurstscript.attributes.AttrNearest.nextScope
@@ -527,6 +544,10 @@ Element.attrNearestClassOrInterface()
 	returns @Nullable ClassOrInterface
 	implemented by de.peeeq.wurstscript.attributes.AttrNearest.nearestClassOrInterface
 
+Element.attrNearestClassOrInterfaceOrInstance()
+	returns @Nullable ClassOrInterfaceOrInstance
+	implemented by de.peeeq.wurstscript.attributes.AttrNearest.attrNearestClassOrInterfaceOrInstance
+
 Element.attrNearestClassOrModule()
 	returns @Nullable ClassOrModule
 	implemented by de.peeeq.wurstscript.attributes.AttrNearest.nearestClassOrModule
@@ -893,6 +914,13 @@ WPackage.attrExportedTypeNameLinks
 	returns com.google.common.collect.ImmutableMultimap<String, de.peeeq.wurstscript.attributes.names.TypeLink>
 	implemented by de.peeeq.wurstscript.attributes.names.Exports.exportedTypeNameLinks
 
+WPackage.attrTypeClasses
+	returns java.util.List<InstanceDecl>
+	implemented by de.peeeq.wurstscript.TypeClasses.availableTypeClasses
+
+WPackage.attrDefinedTypeClasses
+	returns java.util.List<InstanceDecl>
+	implemented by de.peeeq.wurstscript.TypeClasses.definedTypeClasses
 
 Element.lookupType(String name, boolean showErrors)
 	returns @Nullable TypeDef

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

@@ -1,3 +1,4 @@
+
 grammar Wurst;
 
 @header {
@@ -112,8 +113,16 @@ entity:
       | interfaceDef
       | tupleDef
       | extensionFuncDef
+      | instanceDeclaration
 ;
 
+instanceDeclaration:
+    modifiersWithDoc 'implements' implemented=typeExpr ('for' (params+=typeParam (',' params+=typeParam)*))?
+    NL (STARTBLOCK
+        funcDef*
+    ENDBLOCK)?
+    ;
+
 interfaceDef:
                 modifiersWithDoc 'interface' name=ID typeParams 
                 ('extends' extended+=typeExpr (',' extended+=typeExpr)*)? 

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/CompiletimeFunctionRunner.java

@@ -241,7 +241,7 @@ private void executeCompiletimeExpr(ImCompiletimeExpr cte) {
         public ImVar initFor(ILconstObject obj) {
 
 
-            ImVar res = JassIm.ImVar(obj.getTrace(), obj.getType(), obj.getType() + "_compiletime", false);
+            ImVar res = JassIm.ImVar(obj.getTrace(), obj.getType(), obj.getType() + "_compiletime", Collections.emptyList());
             imProg.getGlobals().add(res);
             ImAlloc alloc = JassIm.ImAlloc(obj.getTrace(), obj.getType());
             addCompiletimeStateInitAlloc(alloc.getTrace(), res, alloc);
@@ -281,7 +281,7 @@ public ImVar initFor(IlConstHandle a) {
                 @SuppressWarnings("unchecked")
                 ArrayListMultimap<HashtableProvider.KeyPair, Object> map = (ArrayListMultimap<HashtableProvider.KeyPair, Object>) obj;
                 ImType type = TypesHelper.imHashTable();
-                ImVar res = JassIm.ImVar(trace, type, type + "_compiletime", false);
+                ImVar res = JassIm.ImVar(trace, type, type + "_compiletime", Collections.emptyList());
                 imProg.getGlobals().add(res);
 
                 init = constantToExprHashtable(trace, res, a, map);

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/WurstCompilerJassImpl.java

@@ -346,7 +346,7 @@ private void resolveImport(Function<File, CompilationUnit> addCompilationUnit, S
     private CompilationUnit loadLibPackage(Function<File, CompilationUnit> addCompilationUnit, String imp) {
         File file = getLibs().get(imp);
         if (file == null) {
-            gui.sendError(new CompileError(new WPos("", null, 0, 0), "Could not find lib-package " + imp + ". Are you missing your wurst.dependencies file?"));
+            gui.sendError(new CompileError(WPos.noSource(), "Could not find lib-package " + imp + ". Are you missing your wurst.dependencies file?"));
             return Ast.CompilationUnit(new CompilationUnitInfo(errorHandler), Ast.JassToplevelDeclarations(), Ast.WPackages());
         } else {
             return addCompilationUnit.apply(file);
@@ -410,10 +410,22 @@ public JassProg transformProgToJass() {
         beginPhase(2, "Eliminate generics");
         new EliminateGenerics(imTranslator2, imProg2).transform();
         printDebugImProg("./test-output/im " + stage++ + "_genericsEliminated.im");
+        if (!runArgs.isLua()) {
+            try {
+                EliminateTypeClasses.transform(imTranslator2);
+            } finally {
+                printDebugImProg("./test-output/at_crash.im");
+            }
+        }
+        printDebugImProg("./test-output/im " + stage++ + "_typeClassesEliminated.im");
+
 
         // eliminate classes
         beginPhase(2, "translate classes");
 
+        ClassesOptimizer.optimizeProg(imTranslator2);
+        printDebugImProg("./test-output/im " + stage++ + "_classes_optimized.im");
+
         new EliminateClasses(imTranslator2, imProg2, !runArgs.isUncheckedDispatch()).eliminateClasses();
         imTranslator2.assertProperties();
         printDebugImProg("./test-output/im " + stage++ + "_classesEliminated.im");
@@ -543,7 +555,7 @@ private void addJassHotCodeReloadCode() {
         ImFunction jhcr_reload = JassIm.ImFunction(trace, "jhcr_reload_on_escape", JassIm.ImTypeVars(), JassIm.ImVars(), JassIm.ImVoid(), JassIm.ImVars(), reloadBody, Collections.emptyList());
 
 
-        ImVar trig = JassIm.ImVar(trace, TypesHelper.imTrigger(), "trig", false);
+        ImVar trig = JassIm.ImVar(trace, TypesHelper.imTrigger(), "trig", Collections.emptyList());
         mainFunc.getLocals().add(trig);
         // TriggerRegisterPlayerEventEndCinematic(trig, Player(0))
         stmts.add(JassIm.ImSet(trace, JassIm.ImVarAccess(trig), callExtern(trace, CallType.NORMAL, "CreateTrigger")));
@@ -611,6 +623,8 @@ private void printDebugImProg(String debugFile) {
         } catch (IOException e) {
             ErrorReporting.instance.handleSevere(e, getCompleteSourcecode());
         }
+        // basic sanity check
+        getImTranslator().assertProperties(AssertProperty.rooted(getImProg()));
     }
 
     private WurstModel mergeCompilationUnits(List<CompilationUnit> compilationUnits) {
@@ -817,4 +831,12 @@ public LuaCompilationUnit transformProgToLua() {
         LuaCompilationUnit luaCode = luaTranslator.translate();
         return luaCode;
     }
+
+    /**
+     * Clears the intermediate output programs to allow collection by garbage collector
+     */
+    public void clear() {
+        imProg = null;
+        prog = null;
+    }
 }

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

@@ -118,6 +118,11 @@ public void case_TupleDef(TupleDef tupleDef) {
                 add(tupleDef.getName(), SymbolKind.Class);
             }
 
+            @Override
+            public void case_InstanceDecl(InstanceDecl instanceDecl) {
+                // ignore
+            }
+
             @Override
             public void case_FuncDef(FuncDef funcDef) {
                 SymbolKind kind = funcDef.attrIsDynamicClassMember() ? SymbolKind.Method : SymbolKind.Function;

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

@@ -631,6 +631,11 @@ public List<Either<String, MarkedString>> case_ExprNull(ExprNull exprNull) {
             return string("The null-reference");
         }
 
+        @Override
+        public List<Either<String, MarkedString>> case_TypeParamConstraintList(TypeParamConstraintList typeParamConstraintList) {
+            return string("Type parameter constraints define type classes that must be implemented for type parameters.");
+        }
+
         @Override
         public List<Either<String, MarkedString>> case_ClassDefs(ClassDefs classDefs) {
             return string("A list of class definitions.");
@@ -736,6 +741,11 @@ public List<Either<String, MarkedString>> case_ExprIfElse(ExprIfElse exprIfElse)
             return string("A conditional expression (condition ? ifTrue : ifFalse).");
         }
 
+        @Override
+        public List<Either<String, MarkedString>> case_TypeParamConstraint(TypeParamConstraint t) {
+            return string(t.description());
+        }
+
         @Override
         public List<Either<String, MarkedString>> case_WurstDoc(WurstDoc wurstDoc) {
             return wurstDoc.getParent().match(this);
@@ -766,6 +776,11 @@ public List<Either<String, MarkedString>> case_ModVararg(ModVararg modVararg) {
             return string("Declares the parameter to be a array of variable length");
         }
 
+        @Override
+        public List<Either<String, MarkedString>> case_InstanceDecl(InstanceDecl instanceDecl) {
+            return string("An instance declaration for the type-class " + instanceDecl.getImplementedInterface().attrTyp());
+        }
+
         @Override
         public List<Either<String, MarkedString>> case_TypeExprResolved(TypeExprResolved typeExprResolved) {
             return typeExpr(typeExprResolved);

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

@@ -111,6 +111,11 @@ public void case_TupleDef(TupleDef tupleDef) {
                 add(tupleDef.getName(), SymbolKind.Class);
             }
 
+            @Override
+            public void case_InstanceDecl(InstanceDecl instanceDecl) {
+                // ignore
+            }
+
             @Override
             public void case_FuncDef(FuncDef funcDef) {
                 SymbolKind kind = funcDef.attrIsDynamicClassMember() ? SymbolKind.Method : SymbolKind.Function;