diff --git a/pom.xml b/pom.xml index 5569a12e208b8d63b9b64df3181aa02c10f7755b..92125e134d40e986a0662e2d61b5f9086e534bdb 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ de.monticore.lang.monticar cnn-train - 0.3.10-SNAPSHOT + 0.3.11-SNAPSHOT diff --git a/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 b/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 index 96961b60d22b796e65fa4d8f74ba61a5d8bbd370..62d17919b9cd81bc9154568befb74e3afec23ce2 100644 --- a/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 +++ b/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 @@ -2,7 +2,9 @@ package de.monticore.lang.monticar; grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.NumberUnit{ - symbol scope CNNTrainCompilationUnit = "configuration" + symbol scope CNNTrainCompilationUnit = + ("package" package:(Name& || ".")+ ";")? // optional package declaration + "configuration" name:Name& Configuration; diff --git a/src/main/java/de/monticore/lang/monticar/cnntrain/_symboltable/CNNTrainSymbolTableCreator.java b/src/main/java/de/monticore/lang/monticar/cnntrain/_symboltable/CNNTrainSymbolTableCreator.java index 1315727c8ad7abce1d3e353394c1674779a030c0..1a895e56c38ecc6b1a0dff5037baf2b6201f39e0 100644 --- a/src/main/java/de/monticore/lang/monticar/cnntrain/_symboltable/CNNTrainSymbolTableCreator.java +++ b/src/main/java/de/monticore/lang/monticar/cnntrain/_symboltable/CNNTrainSymbolTableCreator.java @@ -14,6 +14,7 @@ import de.monticore.symboltable.ArtifactScope; import de.monticore.symboltable.ImportStatement; import de.monticore.symboltable.MutableScope; import de.monticore.symboltable.ResolvingConfiguration; +import de.se_rwth.commons.Names; import de.se_rwth.commons.logging.Log; import org.antlr.v4.runtime.misc.Pair; @@ -44,6 +45,8 @@ public class CNNTrainSymbolTableCreator extends CNNTrainSymbolTableCreatorTOP { List imports = new ArrayList<>(); + this.compilationUnitPackage = Names.getQualifiedName(compilationUnit.getPackageList()); + ArtifactScope artifactScope = new ArtifactScope( Optional.empty(), compilationUnitPackage,