Merge branch 'ExecutionSemantics' into 'master'

Execution semantics

See merge request !26

pom.xml

@@ -10,35 +10,31 @@
 
   <groupId>de.monticore.lang.monticar</groupId>
   <artifactId>embedded-montiarc</artifactId>
-  <version>0.2.12-SNAPSHOT</version>
+  <version>0.4.4-SNAPSHOT</version>
 
   <!-- == PROJECT DEPENDENCIES ============================================= -->
 
   <properties>
-    <wagon.provider.version>2.6</wagon.provider.version>
-
     <!-- .. EMA-Libraries ................................................. -->
-    <struct.version>0.2.12-SNAPSHOT</struct.version>
-    <Common-MontiCar.version>0.2.12-SNAPSHOT</Common-MontiCar.version>
-    <tagging.version>0.2.12-SNAPSHOT</tagging.version>
+    <struct.version>0.4.4-SNAPSHOT</struct.version>
+    <Common-MontiCar.version>0.4.4-SNAPSHOT</Common-MontiCar.version>
+    <tagging.version>0.4.4-SNAPSHOT</tagging.version>
 
     <!-- .. SE-Libraries .................................................. -->
     <monticore.version>5.0.0</monticore.version>
     <se-commons.version>1.7.7</se-commons.version>
     <mc.grammars.assembly.version>0.0.6-SNAPSHOT</mc.grammars.assembly.version>
-    <languages.version>4.0.1-SNAPSHOT</languages.version>
+
     <!-- .. Libraries .................................................. -->
     <guava.version>25.1-jre</guava.version>
     <junit.version>4.13.1</junit.version>
-    <logback.version>1.1.2</logback.version>
-	<jscience.version>4.3.1</jscience.version>
     <jsr305.version>3.0.0</jsr305.version>
+
     <!-- .. Plugins ....................................................... -->
     <monticore.plugin>5.0.0</monticore.plugin>
     <assembly.plugin>2.5.4</assembly.plugin>
     <compiler.plugin>3.3</compiler.plugin>
     <source.plugin>2.4</source.plugin>
-    <shade.plugin>2.4.3</shade.plugin>
 
     <!-- Classifiers -->
     <grammars.classifier>grammars</grammars.classifier>
@@ -54,12 +50,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4-runtime</artifactId>
-      <version>4.7.1</version>
-    </dependency>
-
     <dependency>
       <groupId>de.monticore.lang</groupId>
       <artifactId>Tagging</artifactId>
@@ -94,18 +84,6 @@
 
 
     <!-- MontiCore Dependencies -->
-    <dependency>
-      <groupId>de.monticore</groupId>
-      <artifactId>monticore-runtime</artifactId>
-      <version>${monticore.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>de.monticore</groupId>
-      <artifactId>monticore-grammar</artifactId>
-      <version>${monticore.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>de.monticore</groupId>
       <artifactId>monticore-grammar</artifactId>
@@ -120,18 +98,6 @@
       <version>${jsr305.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>de.se_rwth.commons</groupId>
-      <artifactId>se-commons-groovy</artifactId>
-      <version>${se-commons.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>de.monticore.lang.monticar</groupId>
-      <artifactId>common-monticar</artifactId>
-      <version>${Common-MontiCar.version}</version>
-    </dependency>
-
 
     <dependency>
       <groupId>de.monticore.lang.monticar</groupId>
@@ -149,26 +115,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>de.monticore</groupId>
-      <artifactId>monticore-runtime</artifactId>
-      <version>${monticore.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>${logback.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jscience</groupId>
-      <artifactId>jscience</artifactId>
-      <version>${jscience.version}</version>
-    </dependency>
-
   </dependencies>
     <!-- == PROJECT BUILD SETTINGS =========================================== -->
 
@@ -188,19 +134,6 @@
                     <skip>false</skip>
                     <script>de/monticore/monticore_noemf.groovy</script>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.antlr</groupId>
-                        <artifactId>antlr4</artifactId>
-                        <version>4.7.1</version>
-                    </dependency>
-                    <!-- https://mvnrepository.com/artifact/org.antlr/antlr4-runtime -->
-                    <dependency>
-                        <groupId>org.antlr</groupId>
-                        <artifactId>antlr4-runtime</artifactId>
-                        <version>4.7.1</version>
-                    </dependency>
-                </dependencies>
                 <executions>
                     <execution>
                         <goals>
@@ -274,32 +207,32 @@
                 </executions>
             </plugin>
             <!-- to add copyright information automatically-->
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <header>${project.baseUri}/src/license/se/license.txt</header>
-                    <properties>
-                        <owner>Michael von Wenckstern</owner>
-                        <email>vonwenckstern@se-rwth.de</email>
-                    </properties>
-                    <excludes>
-                        <exclude>**/README</exclude>
-                        <exclude>src/test/resources/**</exclude>
-                        <exclude>src/main/resources/**</exclude>
-                        <exclude>src/license/**</exclude>
-                    </excludes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>format</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                    </execution>
-                </executions>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>com.mycila</groupId>-->
+<!--                <artifactId>license-maven-plugin</artifactId>-->
+<!--                <version>3.0</version>-->
+<!--                <configuration>-->
+<!--                    <header>${project.baseUri}/src/license/se/license.txt</header>-->
+<!--                    <properties>-->
+<!--                        <owner>Michael von Wenckstern</owner>-->
+<!--                        <email>vonwenckstern@se-rwth.de</email>-->
+<!--                    </properties>-->
+<!--                    <excludes>-->
+<!--                        <exclude>**/README</exclude>-->
+<!--                        <exclude>src/test/resources/**</exclude>-->
+<!--                        <exclude>src/main/resources/**</exclude>-->
+<!--                        <exclude>src/license/**</exclude>-->
+<!--                    </excludes>-->
+<!--                </configuration>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <goals>-->
+<!--                            <goal>format</goal>-->
+<!--                        </goals>-->
+<!--                        <phase>process-sources</phase>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
                  <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

src/main/grammars/de/monticore/lang/embeddedmontiarc/EmbeddedMontiArc.mc4

@@ -64,13 +64,24 @@ grammar EmbeddedMontiArc extends de.monticore.lang.monticar.Common2 {
   */
   
   symbol scope Component implements Element =
-    "component" (["interface"])? Name
-    //("component" | ["component_interface"]) Name
+    ComponentModifier* "component" (["interface"])? Name
 	genericTypeParameters:TypeParameters2?
     (  "("  (Parameter || ",")+  ")" )?
     ("implements" superComponent:ReferenceType)?
     body:ComponentBody;
 
+  interface ComponentModifier;
+
+  VirtModifier implements ComponentModifier =
+    VIRTUAL;
+  enum VIRTUAL =
+    "virtual" | VIRTUAL:"virt" | "nonvirtual" | NONVIRTUAL:"non-virt";
+
+  DFModifier implements ComponentModifier =
+    DIRECTFEEDTHROUGH;
+  enum DIRECTFEEDTHROUGH =
+    DF:"direct feedthrough" | "df" | NONDF:"nondirect feedthrough" | NONDF:"non-df";
+
 
   /**
   * The body contains architectural elements of 
@@ -123,10 +134,11 @@ grammar EmbeddedMontiArc extends de.monticore.lang.monticar.Common2 {
     *   created
     */
     SubComponent implements Element =
-       "instance"
+      "instance"
       type:ReferenceType
       ("(" arguments:(Expression || ",")+ ")" )?
-      instances:(SubComponentInstance || ",")* ";" ;
+      ("{" (PortInitial || ",")+ "}")?
+      instances:(SubComponentInstance || ",")+ ";" ;
 
 
   /**
@@ -143,7 +155,13 @@ grammar EmbeddedMontiArc extends de.monticore.lang.monticar.Common2 {
   // TODO better/more intuitive name? e.g. "refConnector" (not really good...)
   SubComponentInstance =
     Name
-    ("[" UnitNumberResolution "]")? ;
+    ("[" UnitNumberResolution "]")?;
+
+  PortInitial =
+    Name ( "[" UnitNumberResolution "]" )?
+    "(" "t=0" ")"
+    (guess:["~"])? "="
+    Expression;
 
   /**
     * port1

src/main/java/de/monticore/lang/embeddedmontiarc/cocos/ComponentModifierUnique.java

+/* (c) https://github.com/MontiCore/monticore */
+package de.monticore.lang.embeddedmontiarc.cocos;
+
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTComponent;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTComponentModifier;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTComponentCoCo;
+import de.se_rwth.commons.logging.Log;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * ensures that component modifiers such as virtual or nondirectfeedthrough are unique
+ */
+public class ComponentModifierUnique implements EmbeddedMontiArcASTComponentCoCo {
+
+    @Override
+    public void check(ASTComponent node) {
+        Set<Class> modifiers = new HashSet<>();
+        for (ASTComponentModifier astComponentModifier : node.getComponentModifierList()) {
+            if (modifiers.contains(astComponentModifier.getClass()))
+                Log.error("0xAC010 Component Modifiers must be unique");
+            modifiers.add(astComponentModifier.getClass());
+        }
+    }
+}

src/main/java/de/monticore/lang/embeddedmontiarc/cocos/ComponentWithTypeParametersHasInstance.java

@@ -3,8 +3,8 @@ package de.monticore.lang.embeddedmontiarc.cocos;
 
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTComponent;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTComponentCoCo;
-import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstantiationSymbol;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAComponentSymbol;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstantiationSymbol;
 import de.se_rwth.commons.logging.Log;
 
 import java.util.Collection;

src/main/java/de/monticore/lang/embeddedmontiarc/cocos/ConstantConnectorTargetRangeValid.java

 package de.monticore.lang.embeddedmontiarc.cocos;
 
-import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.*;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTComponent;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTConnector;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTPort;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTQualifiedNameWithArrayAndStar;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTComponentCoCo;
 import de.monticore.lang.monticar.types2._ast.ASTElementType;
 import de.se_rwth.commons.logging.Log;
+
 import java.util.List;
 import java.util.Optional;
 

src/main/java/de/monticore/lang/embeddedmontiarc/cocos/DefaultParametersHaveCorrectOrder.java

-/* (c) https://github.com/MontiCore/monticore */
+/* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.embeddedmontiarc.cocos;
 
-import de.monticore.lang.monticar.common2._ast.ASTParameter;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTComponent;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTComponentCoCo;
+import de.monticore.lang.monticar.common2._ast.ASTParameter;
 import de.se_rwth.commons.logging.Log;
 
 import java.util.List;

src/main/java/de/monticore/lang/embeddedmontiarc/cocos/EmbeddedMontiArcCoCos.java

-/* (c) https://github.com/MontiCore/monticore */
+/* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.embeddedmontiarc.cocos;
 
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTConnectorCoCo;
-import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.*;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcCoCoChecker;
 
 /**
  * Bundle of CoCos for the MontiArc language.
@@ -29,6 +29,7 @@ public class EmbeddedMontiArcCoCos {
         .addCoCo(new OnlyIncomingPortIsConfig())
         .addCoCo(new InRosPortRosSender())
         .addCoCo(new ConstantConnectorTargetRangeValid())
-        .addCoCo((new DistinctTargetPorts()));
+        .addCoCo((new DistinctTargetPorts()))
+        .addCoCo(new InitialGuessIsNotAssignmentCoCo());
   }
 }

src/main/java/de/monticore/lang/embeddedmontiarc/cocos/InPortUniqueSender.java

 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.embeddedmontiarc.cocos;
 
-import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.*;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTComponent;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTConnector;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTQualifiedNameWithArrayAndStar;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTComponentCoCo;
 import de.monticore.lang.monticar.common2._ast.ASTQualifiedNameWithArray;
-import de.monticore.types.types._ast.ASTQualifiedName;
 import de.se_rwth.commons.logging.Log;
 
 import java.util.ArrayList;

src/main/java/de/monticore/lang/embeddedmontiarc/cocos/InitialGuessIsAssignment.java

+/* (c) https://github.com/MontiCore/monticore */
+package de.monticore.lang.embeddedmontiarc.cocos;
+
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTPortInitial;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTSubComponent;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTSubComponentCoCo;
+import de.monticore.mcexpressions._ast.ASTAssignmentExpression;
+import de.se_rwth.commons.logging.Log;
+
+public class InitialGuessIsAssignment implements EmbeddedMontiArcASTSubComponentCoCo {
+    @Override
+    public void check(ASTSubComponent node) {
+        for (ASTPortInitial initialGuess : node.getPortInitialList()) {
+            if (initialGuess.getExpression() instanceof ASTAssignmentExpression) {
+                Log.error(String.format("0x079B7 Initial guess of has to be an assignment"),
+                node.get_SourcePositionStart());
+            }
+        }
+
+    }
+}

src/main/java/de/monticore/lang/embeddedmontiarc/cocos/InitialGuessIsNotAssignmentCoCo.java

+/* (c) https://github.com/MontiCore/monticore */
+package de.monticore.lang.embeddedmontiarc.cocos;
+
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTPortInitial;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTSubComponent;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTSubComponentCoCo;
+import de.monticore.mcexpressions._ast.ASTAssignmentExpression;
+import de.se_rwth.commons.logging.Log;
+
+public class InitialGuessIsNotAssignmentCoCo implements EmbeddedMontiArcASTSubComponentCoCo {
+    @Override
+    public void check(ASTSubComponent node) {
+        for (ASTPortInitial portInitial : node.getPortInitialList()) {
+            if (portInitial.getExpression() instanceof ASTAssignmentExpression) {
+                Log.error(String.format("0x079B7 Initial guess of has to be an assignment"),
+                node.get_SourcePositionStart());
+            }
+        }
+
+    }
+}

src/main/java/de/monticore/lang/embeddedmontiarc/cocos/ParameterNamesUnique.java

-/* (c) https://github.com/MontiCore/monticore */
+/* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.embeddedmontiarc.cocos;
 
-import de.monticore.lang.monticar.common2._ast.ASTParameter;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTComponent;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTComponentCoCo;
+import de.monticore.lang.monticar.common2._ast.ASTParameter;
 import de.se_rwth.commons.logging.Log;
 
 import java.util.ArrayList;

src/main/java/de/monticore/lang/embeddedmontiarc/cocos/PortTypeOnlyBooleanOrSIUnit.java

 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.embeddedmontiarc.cocos;
 
-import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTPortCoCo;
-
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTPort;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTPortCoCo;
 import de.monticore.lang.monticar.ranges._ast.ASTRange;
 import de.monticore.lang.monticar.ranges._ast.ASTRanges;
-//import de.monticore.types.types._ast.ASTPrimitiveType;
-//import de.monticore.types.types._ast.ASTType;
-import de.monticore.lang.monticar.types2._ast.*;
 import de.monticore.types.types._ast.ASTPrimitiveType;
 import de.monticore.types.types._ast.ASTType;
 import de.se_rwth.commons.logging.Log;

src/main/java/de/monticore/lang/embeddedmontiarc/cocos/ReferencedSubComponentExists.java

 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.embeddedmontiarc.cocos;
 
-import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAComponentSymbol;
-import de.monticore.lang.embeddedmontiarc.helper.ArcTypePrinter;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTSubComponent;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTSubComponentCoCo;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAComponentSymbol;
+import de.monticore.lang.embeddedmontiarc.helper.ArcTypePrinter;
 import de.monticore.symboltable.Scope;
 import de.se_rwth.commons.logging.Log;
 

src/main/java/de/monticore/lang/embeddedmontiarc/cocos/SubComponentsConnected.java

@@ -3,10 +3,10 @@ package de.monticore.lang.embeddedmontiarc.cocos;
 
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTComponent;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTComponentCoCo;
-import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstantiationSymbol;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAComponentSymbol;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAConnectorSymbol;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAPortSymbol;
+import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstantiationSymbol;
 import de.se_rwth.commons.logging.Log;
 
 import java.util.Collection;

src/main/java/de/monticore/lang/embeddedmontiarc/cocos/UniquePorts.java

 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.embeddedmontiarc.cocos;
 
-import de.monticore.lang.embeddedmontiarc.helper.ArcTypePrinter;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTInterface;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast.ASTPort;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._cocos.EmbeddedMontiArcASTInterfaceCoCo;
+import de.monticore.lang.embeddedmontiarc.helper.ArcTypePrinter;
 import de.se_rwth.commons.StringTransformations;
 import de.se_rwth.commons.logging.Log;
 

src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_ast/ASTComponent.java

-/* (c) https://github.com/MontiCore/monticore */
+/* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.embeddedmontiarc.embeddedmontiarc._ast;
 
 import de.monticore.lang.monticar.common2._ast.ASTParameter;
-import de.monticore.types.types._ast.ASTReferenceType;
 import de.monticore.lang.monticar.types2._ast.ASTTypeParameters2;
+import de.monticore.types.types._ast.ASTReferenceType;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,12 +16,12 @@ import java.util.stream.Collectors;
  */
 public class ASTComponent extends ASTComponentTOP {
 
-    public ASTComponent() {
+    protected ASTComponent() {
         super();
     }
 
-    public ASTComponent(String name, Optional<ASTTypeParameters2> genericTypeParameters, List<ASTParameter> parameters, Optional<ASTReferenceType> superComponent, ASTComponentBody body, boolean r__interface) {
-        super(name, genericTypeParameters, parameters, superComponent, body, r__interface);
+    protected ASTComponent(List<ASTComponentModifier> componentModifiers, String name, Optional<ASTTypeParameters2> genericTypeParameters, List<ASTParameter> parameters, Optional<ASTReferenceType> superComponent, ASTComponentBody body, boolean r__interface) {
+        super(componentModifiers, name, genericTypeParameters, parameters, superComponent, body, r__interface);
     }
 
     // do not use symbol table, since symbol table must not be created

src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/ActualTypeArgumentASTElement.java

 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable;
 
-import de.monticore.types.types._ast.ASTTypeArgument;
 import de.monticore.symboltable.types.TypeSymbol;
 import de.monticore.symboltable.types.references.ActualTypeArgument;
 import de.monticore.symboltable.types.references.TypeReference;
+import de.monticore.types.types._ast.ASTTypeArgument;
 
 /**
  */

src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/EmbeddedMontiArcLanguage.java

@@ -10,17 +10,17 @@ import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instance
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstantiationSymbol;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAConnectorInstanceSymbol;
 import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAPortInstanceSymbol;
-import de.monticore.lang.monticar.ts.MCASTTypeSymbol;
-import de.monticore.lang.monticar.ts.MontiCarTypeSymbol;
 import de.monticore.lang.monticar.si._symboltable.ResolutionDeclarationSymbol;
-import de.monticore.lang.monticar.types2._symboltable.UnitNumberResolutionSymbol;
 import de.monticore.lang.monticar.si._symboltable.SIUnitRangesSymbol;
 import de.monticore.lang.monticar.si._symboltable.SIUnitSymbol;
+import de.monticore.lang.monticar.ts.MCASTTypeSymbol;
+import de.monticore.lang.monticar.ts.MCFieldSymbol;
+import de.monticore.lang.monticar.ts.MCTypeSymbol;
+import de.monticore.lang.monticar.ts.MontiCarTypeSymbol;
+import de.monticore.lang.monticar.types2._symboltable.UnitNumberResolutionSymbol;
 import de.monticore.modelloader.ModelingLanguageModelLoader;
 import de.monticore.symboltable.resolving.CommonResolvingFilter;
-import de.monticore.lang.monticar.ts.MCFieldSymbol;
 import de.monticore.symboltable.types.JMethodSymbol;
-import de.monticore.lang.monticar.ts.MCTypeSymbol;
 
 /**
  * The MontiArc Language

src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/EmbeddedMontiArcModelLoader.java

 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.NoSuchElementException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 import de.monticore.ModelingLanguageFamily;
 import de.monticore.io.paths.ModelPath;
 import de.monticore.lang.embeddedmontiarc.LogConfig;
@@ -29,6 +15,17 @@ import de.monticore.symboltable.ResolvingConfiguration;
 import de.monticore.symboltable.Scope;
 import de.se_rwth.commons.logging.Log;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collection;
+import java.util.NoSuchElementException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
 /**
  * Created by Michael von Wenckstern on 30.05.2016.