Add Typecheck3 and SymbolTable

build.gradle

@@ -1,5 +1,6 @@
 plugins {
     id "de.monticore.generator" version "$mc_version" apply false
+    id "com.github.johnrengelman.shadow" version "$shadow_plugin_version" apply false
 }
 
 allprojects {

gradle.properties

@@ -6,7 +6,7 @@ useLocalRepo=false
 
 org.gradle.caching=true
 org.gradle.welcome=never
-org.gradle.jvmargs=-Xms3072m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xms3072m -Xss16m -Dfile.encoding=UTF-8
 
 version=7.9.0-SNAPSHOT
 

javaDSL/build.gradle

@@ -1,3 +1,7 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+apply plugin:"com.github.johnrengelman.shadow"
+
 description = "MontiCore: Java DSL"
 
 def grammarsDir = "src/main/grammars"
@@ -47,11 +51,26 @@ tasks.withType(Test).configureEach {
     dependsOn(extractCorpus)
 }
 
+tasks.register('buildJavaDSLTool', ShadowJar) {
+    minimize()
+    group = 'mc'
+    archiveFileName = 'MCJavaDSL.jar'
+    archiveClassifier = 'javadsl-mc-tool'
+    manifest {
+        attributes('Main-Class':'de.monticore.java.JavaDSLTool')
+    }
+    from sourceSets.main.output
+    configurations = [project.configurations.runtimeClasspath]
+}
+jar.dependsOn(buildJavaDSLTool)
+
 dependencies {
     implementation "de.monticore.lang:cd4analysis:$mc_version"
+    implementation "de.monticore:class2mc:$mc_version"
 
     grammar "de.monticore:monticore-grammar:$mc_version"
 
+    testImplementation testFixtures("de.monticore:monticore-grammar:$mc_version")
     testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
     testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"

javaDSL/src/main/grammars/de/monticore/java/JavaDSL.mc4

@@ -71,6 +71,7 @@ package de.monticore.java;
  *     |-> de.monticore.types.MCBasicTypes (*)
  * |-> de.monticore.types.MCFullGenericTypes (*)
  * |-> de.monticore.types.TypeParameters (*)
+ * |-> de.monticore.types.MCStructuralTypes
  *
  * (*) Repeated Dependencies are omitted.
  */
@@ -83,7 +84,8 @@ grammar JavaDSL extends
 	de.monticore.statements.MCFullJavaStatements,
 	de.monticore.types.MCArrayTypes,
 	de.monticore.types.MCFullGenericTypes,
-	de.monticore.types.TypeParameters {
+	de.monticore.types.TypeParameters,
+	de.monticore.types.MCStructuralTypes {
 
 start CompilationUnit;
 
@@ -122,10 +124,11 @@ RequiresDirective implements ModuleDirective
     = "requires" RequiresModifier? MCQualifiedName ";"
     ;
 
-enum RequiresModifier
-    = "static"
-    | "transitive"
-    ;
+
+interface RequiresModifier;
+
+StaticModifier implements RequiresModifier = ["static"];
+TransitiveModifier implements RequiresModifier = ["transitive"];
 
 ExportsDirective implements ModuleDirective
     = "exports" MCQualifiedName ("to" toModules:(MCQualifiedName || ",")+)? ";"
@@ -152,25 +155,25 @@ nokeyword "uses";
 nokeyword "provides";
 nokeyword "with";
 nokeyword "to";
+nokeyword "transitive";
 
 // Type declarations
-abstract symbol scope TypeDeclaration implements ClassMemberDeclaration, InterfaceMemberDeclaration, AnnotationTypeElementDeclaration, MCBlockStatement, OOType = Name ;
+// TODO: Remove Java-specific Interfaces, reuse component grammars and use CoCos for validation?
+abstract symbol scope(shadowing) TypeDeclaration implements ClassMemberDeclaration, InterfaceMemberDeclaration, AnnotationTypeElementDeclaration, MCBlockStatement, OOType = Name ;
 
 symbolrule TypeDeclaration =
-    isAnnotation: boolean ;
+    isAnnotation: boolean
+    isRecord: boolean;
 
-symbol scope ClassDeclaration extends TypeDeclaration
+// TODO: Remove scope duplicate when monticore#4726 is fixed
+scope(shadowing) ClassDeclaration extends TypeDeclaration
     =   JavaModifier* "class" Name TypeParameters?
         ("extends" superClass:MCType)?
         ("implements" implementedInterface:(MCType || ",")+)?
-        ClassBody
+        ClassBody ";"*
     ;
 
-symbolrule ClassDeclaration =
-    superInterface:MCType*
-    constructor: de.monticore.javalight._symboltable.JavaMethodSymbol*
-    methods: de.monticore.javalight._symboltable.JavaMethodSymbol* ;
-
+// TODO Replace with MCJavaBlock? -> with CoCos?
 ClassBody
     =   "{" ClassBodyDeclaration* "}"
     ;
@@ -181,12 +184,17 @@ ClassBody
  * https://docs.oracle.com/javase/specs/jls/se19/html/jls-8.html#jls-8.10
  */
 
-symbol scope RecordDeclaration extends TypeDeclaration
+// TODO: Remove scope duplicate when monticore#4726 is fixed
+scope(shadowing) RecordDeclaration extends TypeDeclaration
     = JavaModifier* "record" Name TypeParameters? RecordHeader
         ("implements" implementedInterface:(MCType || ",")+)?
-        RecordBody
+        RecordBody ";"*
     ;
 
+// TODO: "record" is a contextual keyword, but setting it to nokeyword creates conflicts with MethodDeclaration
+//       -> might need to be fixed in MontiCore itself
+//nokeyword "record";
+
 RecordHeader
     = "(" (RecordComponent || ",")* ")"
     ;
@@ -200,6 +208,7 @@ astrule RecordComponent =
       return this.isPresentVariableArity();
     };
 
+// TODO Replace with MCJavaBlock? -> with CoCos?
 RecordBody
     = "{" (ClassBodyDeclaration | CompactConstructorDeclaration)* "}"
     ;
@@ -208,27 +217,27 @@ CompactConstructorDeclaration
     = JavaModifier* Name body:MCJavaBlock
     ;
 
-symbol scope InterfaceDeclaration extends TypeDeclaration
+// TODO: Remove scope duplicate when monticore#4726 is fixed
+scope(shadowing) InterfaceDeclaration extends TypeDeclaration
     =   JavaModifier* "interface" Name TypeParameters?
         ("extends" extendedInterface:(MCType || ",")+)?
-        InterfaceBody
+        InterfaceBody ";"*
     ;
 
+// TODO Replace with MCJavaBlock? -> with CoCos?
 InterfaceBody
     =   "{" InterfaceBodyDeclaration* "}"
     ;
 
-symbol scope EnumDeclaration extends TypeDeclaration
+// TODO: Remove scope duplicate when monticore#4726 is fixed
+scope(shadowing) EnumDeclaration extends TypeDeclaration
     =   JavaModifier* "enum" Name
         ("implements" implementedInterface:(MCType || ",")+)?
-        "{" (EnumConstantDeclaration || ",")* ","? EnumBody? "}"
+        "{" (EnumConstantDeclaration || ",")* ","? EnumBody? "}" ";"*
     ;
 
-symbolrule EnumDeclaration =
-    constructor: de.monticore.javalight._symboltable.JavaMethodSymbol*
-    methods: de.monticore.javalight._symboltable.JavaMethodSymbol*;
-
-symbol EnumConstantDeclaration
+// TODO: Remove scope duplicate when monticore#4726 is fixed
+scope(shadowing) symbol EnumConstantDeclaration implements Field
     =   Annotation* Name Arguments? ClassBody?
     ;
 
@@ -237,9 +246,12 @@ EnumBody
     ;
 
 ClassBlock implements ClassBodyDeclaration
-    =   (["static"])? JavaBlock
+    =   (["static"])? MCJavaBlock
     ;
 
+@Override
+EmptyStatement implements ClassBodyDeclaration;
+
 interface ClassMemberDeclaration extends ClassBodyDeclaration ;
 
 interface MethodBody ;
@@ -266,21 +278,25 @@ ArrayInitializer implements VariableInitializer
     ;
 
 // ANNOTATIONS
-
-symbol scope AnnotationTypeDeclaration extends TypeDeclaration
+// TODO: Remove scope duplicate when monticore#4726 is fixed
+scope(shadowing) AnnotationTypeDeclaration extends TypeDeclaration
     =   JavaModifier* "@" "interface" Name AnnotationTypeBody
     ;
 
+// TODO Replace with MCJavaBlock? -> with CoCos? | Replace with { InterfaceBodyDeclaration }
 AnnotationTypeBody
     =   "{" (AnnotationTypeElementDeclaration)* "}"
     ;
 
 interface AnnotationTypeElementDeclaration ;
 
-symbol scope AnnotationMethod implements AnnotationTypeElementDeclaration
+// TODO Replace with MethodDeclaration?
+// TODO: Remove scope duplicate when monticore#4726 is fixed
+scope(shadowing non_exporting ordered) AnnotationMethod implements AnnotationTypeElementDeclaration, JavaMethod
     =   JavaModifier* MCType Name "(" ")" DefaultValue? ";"
     ;
 
+// TODO Replace with ConstDeclaration?
 AnnotationConstant implements AnnotationTypeElementDeclaration
     =   JavaModifier* MCType (VariableDeclarator || ",")+ ";"
     ;
@@ -309,40 +325,25 @@ MCBasicGenericType implements MCGenericType <20>
     = (AnnotatedName || ".")+ "<" (MCTypeArgument || ",")* ">"
     ;
 
+astrule MCBasicGenericType =
+  method public String printWithoutTypeArguments() {
+    java.util.List<String> names = new ArrayList<>();
+    for(ASTAnnotatedName annotatedName : getAnnotatedNameList()) {
+      names.add(annotatedName.getName());
+    }
+    return String.join(".", names);
+  };
+
 @Override
 MCQualifiedType implements MCObjectType
     = (AnnotatedName || ".")+
     ;
 
 // STATEMENTS / BLOCKS
 
-interface Statement extends MCBlockStatement ;
-
-scope JavaBlock implements Statement, MethodBody, ConstructorBody, FinallyBlock
-    =   "{" MCBlockStatement* "}"
-    ;
-
-scope TryStatement implements Statement
-    =   "try" JavaBlock ExceptionHandler
-    ;
-
-interface ExceptionHandler ;
-
-CatchExceptionsHandler implements ExceptionHandler
-    =   CatchClause+ ("finally" FinallyBlock)?
-    ;
-
-FinallyBlockOnlyHandler implements ExceptionHandler
-    =   ("finally" FinallyBlock)
-    ;
-
-TryStatementWithResources implements Statement
-    =   "try" "(" (Resource || ";")+ ";"? ")" JavaBlock CatchClause* ("finally" FinallyBlock)?
-    ;
-
-Resource
-    =   JavaModifier* MCType DeclaratorId "=" Expression
-    ;
+// TODO: Remove scope duplicate when monticore#4726 is fixed
+@Override
+scope(shadowing) MCJavaBlock implements MethodBody, ConstructorBody;
 
 IdentifierAndTypeArgument
     =   Name TypeArguments?
@@ -352,17 +353,16 @@ TypeArguments
     =   "<" (MCTypeArgument || ",")* ">"
     ;
 
-interface FinallyBlock ;
-
-LabeledStatement implements Statement
-    =   label:Name ":" Statement
-    ;
-
 CreatedName
     =   (IdentifierAndTypeArgument || ".")+
     |   MCPrimitiveType
     ;
 
+// TODO: might need some attention...can we do that better?
+InnerCreatorExpression implements Expression <275>
+    =   Expression "." "new" InnerCreator
+    ;
+
 InnerCreator
     =   firstTypeArguments:TypeArguments? Name secondTypeArguments:TypeArguments? ClassCreatorRest
     ;
@@ -379,6 +379,24 @@ LocalVariableDeclaration
 @Override
 LambdaParameter implements Variable = (["var"] | MCType)? Name;
 
+@Override
+TryLocalVariableDeclaration
+    = JavaModifier* (["var"] | MCType) DeclaratorId "=" Expression ;
+
+// Add support for try-with-resources with external resources
+TryStatement4 implements MCStatement
+    =   "try" "(" resource:Field  ")"
+        core:MCJavaBlock
+        CatchClause*
+        ("finally" finally:MCJavaBlock)? ;
+
+@Override
+EnhancedForControl implements ForControl
+    = EnhancedForControlFormalParameter ":" Expression;
+
+EnhancedForControlFormalParameter
+    = JavaModifier* (["var"] | MCType) Declarator;
+
 nokeyword "var";
 
 /*
@@ -395,7 +413,7 @@ JavaAnnotation extends JavaModifier implements ElementValue
             ( "(" AnnotationArguments? ")" )?
     ;
 
-AnonymousClass implements Creator
+scope(shadowing) AnonymousClass extends ClassCreator implements Creator
     =   MCType Arguments ClassBody?
     ;