Merge branch 'mlc-model-fix' into 'dev'

fixed mlc models and modified build.gradle accordingly See merge request monticore/monticore!928
MontiCore · Jan 12, 2024 · b8c30be · b8c30be
2 parents bc8a131 + 5964e97
commit b8c30be
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/monticore-grammar/build.gradle b/monticore-grammar/build.gradle
@@ -312,7 +312,9 @@ checkArtifactsBitExpressions.dependsOn(checkArtifactsExpressionsBasis)
 checkArtifactsCommonExpressions.dependsOn(checkArtifactsExpressionsBasis)
 checkArtifactsExpressionsBasis.dependsOn(checkArtifactsMCBasics)
 checkArtifactsExpressionsBasis.dependsOn(checkArtifactsMCLiteralsBasis)
+
 checkArtifactsJavaClassExpressions.dependsOn(checkArtifactsCommonExpressions)
+checkArtifactsJavaClassExpressions.dependsOn(checkArtifactsMCFullGenericTypes)
 
 checkArtifactsAntlr.dependsOn(checkArtifactsMCBasics)
 checkArtifactsGrammar.dependsOn(checkArtifactsMCCommonLiterals)
@@ -390,14 +392,19 @@ checkArtifactsRegularExpressions.dependsOn(checkArtifactsMCCommonLiterals)
 
 checkArtifactsRegExType.dependsOn(checkArtifactsRegularExpressions)
 
+checkArtifactsUglyExpressions.dependsOn(checkArtifactsCommonExpressions)
+checkArtifactsUglyExpressions.dependsOn(checkArtifactsMCBasicTypes)
+
 ///////////// dependencies between show artifacts tasks ///////////////////////
 
 showArtifactsAssignmentExpressions.dependsOn(showArtifactsExpressionsBasis)
 showArtifactsBitExpressions.dependsOn(showArtifactsExpressionsBasis)
 showArtifactsCommonExpressions.dependsOn(showArtifactsExpressionsBasis)
 showArtifactsExpressionsBasis.dependsOn(showArtifactsMCBasics)
 showArtifactsExpressionsBasis.dependsOn(showArtifactsMCLiteralsBasis)
+
 showArtifactsJavaClassExpressions.dependsOn(showArtifactsCommonExpressions)
+showArtifactsJavaClassExpressions.dependsOn(showArtifactsMCFullGenericTypes)
 
 showArtifactsAntlr.dependsOn(showArtifactsMCBasics)
 showArtifactsGrammar.dependsOn(showArtifactsMCCommonLiterals)
@@ -475,6 +482,9 @@ showArtifactsRegularExpressions.dependsOn(showArtifactsMCCommonLiterals)
 
 showArtifactsRegExType.dependsOn(showArtifactsRegularExpressions)
 
+showArtifactsUglyExpressions.dependsOn(showArtifactsExpressionsBasis)
+showArtifactsUglyExpressions.dependsOn(showArtifactsMCBasicTypes)
+
 java {
   registerFeature('grammars') {
     usingSourceSet(sourceSets.grammars)

diff --git a/monticore-grammar/src/main/grammars/de/monticore/expressions/AssignmentExpressions.mlc b/monticore-grammar/src/main/grammars/de/monticore/expressions/AssignmentExpressions.mlc
@@ -21,5 +21,6 @@ mlc AssignmentExpressions {
 
   promote {
     mlc "de.monticore.expressions.ExpressionsBasis";
+    include "$mp/com/google/common/base/Preconditions.class";
   }
 }
diff --git a/monticore-grammar/src/main/grammars/de/monticore/expressions/JavaClassExpressions.mlc b/monticore-grammar/src/main/grammars/de/monticore/expressions/JavaClassExpressions.mlc
@@ -21,6 +21,6 @@ mlc JavaClassExpressions {
 
   promote {
     mlc "de.monticore.expressions.CommonExpressions";
-    mlc "de.monticore.types.MCFullGenericTypes"
+    mlc "de.monticore.types.MCFullGenericTypes";
   }
 }
diff --git a/monticore-grammar/src/main/grammars/de/monticore/expressions/UglyExpressions.mlc b/monticore-grammar/src/main/grammars/de/monticore/expressions/UglyExpressions.mlc
@@ -1,6 +1,6 @@
 package de.monticore.expressions;
 
-mlc JavaClassExpressions {
+mlc UglyExpressions {
 
   //export the grammar
   export "$projectDir/src/main/grammars" {
@@ -20,7 +20,7 @@ mlc JavaClassExpressions {
   }
 
   promote {
-    mlc "de.monticore.expressions.CommonExpressions";
-    mlc "de.monticore.types.MCBasicTypes"
+    mlc "de.monticore.expressions.ExpressionsBasis";
+    mlc "de.monticore.types.MCBasicTypes";
   }
 }