Merge branch 'feature/packageDeclaration' into 'master'

Add optional package declaration to CNNTrain grammar && update version number

See merge request !28

pom.xml

@@ -18,7 +18,7 @@
 
     <groupId>de.monticore.lang.monticar</groupId>
     <artifactId>cnn-train</artifactId>
-    <version>0.3.10-SNAPSHOT</version>
+    <version>0.3.11-SNAPSHOT</version>
 
     <!-- == PROJECT DEPENDENCIES ============================================= -->
 

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;
 

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<ImportStatement> imports = new ArrayList<>();
 
+        this.compilationUnitPackage = Names.getQualifiedName(compilationUnit.getPackageList());
+
         ArtifactScope artifactScope = new ArtifactScope(
                 Optional.empty(),
                 compilationUnitPackage,