Merge branch 'master' into yannick.deuster

pom.xml

@@ -46,7 +46,7 @@
     <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>
-    <SIUnit.version>0.0.4-SNAPSHOT</SIUnit.version>
+    <SIUnit.version>0.0.6-SNAPSHOT</SIUnit.version>
 
     <Common-MontiCar.version>0.0.3-SNAPSHOT</Common-MontiCar.version>
 
@@ -135,19 +135,19 @@
       <version>${se-commons.version}</version>
     </dependency>
 
-	<dependency>
-		<groupId>de.monticore.lang</groupId>
-		<artifactId>SIUnit</artifactId>
-		<version>${SIUnit.version}</version>
-	</dependency>
-
-	<dependency>
-		<groupId>de.monticore.lang</groupId>
-		<artifactId>SIUnit</artifactId>
-		<version>${SIUnit.version}</version>
-		<classifier>${grammars.classifier}</classifier>
-		<scope>provided</scope>
-	</dependency>
+    <dependency>
+      <groupId>de.monticore.lang</groupId>
+      <artifactId>NumberUnit</artifactId>
+      <version>${SIUnit.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>de.monticore.lang</groupId>
+      <artifactId>NumberUnit</artifactId>
+      <version>${SIUnit.version}</version>
+      <classifier>${grammars.classifier}</classifier>
+      <scope>provided</scope>
+    </dependency>
 
 
     <dependency>

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

@@ -24,7 +24,7 @@ package de.monticore.lang.embeddedmontiarc;
  *
  * @author Sascha Schneiders, Sining Wang, Yu Qiao
  */
-grammar EmbeddedMontiArc extends de.monticore.lang.monticar.Common2, de.monticore.lang.monticar.Ranges, de.monticore.lang.monticar.MCExpressions {
+grammar EmbeddedMontiArc extends de.monticore.lang.monticar.Common2, de.monticore.lang.monticar.Ranges, de.monticore.lang.monticar.MCExpressions, de.monticore.lang.monticar.Types2 {
 
   /** ASTEMACompilationUnit represents the complete component
    * @attribute package          The package declaration of this component

src/test/resources/testing/NumberUnitTest1.ema

+package testing;
+
+component NumberUnitTest1{
+    ports in Q(-90°:0.001°:90°) in1;
+}
\ No newline at end of file