renamed in Z( to in (

pom.xml

@@ -30,7 +30,7 @@
 
   <groupId>de.monticore.lang.monticar</groupId>
   <artifactId>embedded-montiarc</artifactId>
-  <version>0.1.5-SNAPSHOT</version>
+  <version>0.1.6-SNAPSHOT</version>
 
   <!-- == PROJECT DEPENDENCIES ============================================= -->
 
@@ -44,7 +44,7 @@
     <mc.grammars.assembly.version>0.0.6-SNAPSHOT</mc.grammars.assembly.version>
 	<languages.version>4.0.1-SNAPSHOT</languages.version>
     <struct.version>0.0.14-SNAPSHOT</struct.version>
-    <Common-MontiCar.version>0.0.14-SNAPSHOT</Common-MontiCar.version>
+    <Common-MontiCar.version>0.0.16-SNAPSHOT</Common-MontiCar.version>
     <tagging.version>0.0.6</tagging.version>
     <!-- .. Libraries .................................................. -->
     <guava.version>18.0</guava.version>

src/test/resources/a/SteeringAngleCalculator.ema

 package a;
 
 component SteeringAngleCalculator{
-    ports in Q(-90°:90°) x[2],
-          in Q(-180°:180°) y[2],
-          in Q(-90°:90°) gpsX,
-          in Q(-180°:180°) gpsY,
-          in Q(-180°:180°) orientation,
-          in Q(-180°:180°) currentSteeringAngle,
-          in Q(-180°:180°) minSteeringAngle,
-          in Q(-180°:180°) maxSteeringAngle,
-          out Q(-180°:180°) newSteeringAngle;
+    ports in (-90°:90°) x[2],
+          in (-180°:180°) y[2],
+          in (-90°:90°) gpsX,
+          in (-180°:180°) gpsY,
+          in (-180°:180°) orientation,
+          in (-180°:180°) currentSteeringAngle,
+          in (-180°:180°) minSteeringAngle,
+          in (-180°:180°) maxSteeringAngle,
+          out (-180°:180°) newSteeringAngle;
 }
\ No newline at end of file

src/test/resources/autocart/navigation/PathPlanner.ema

@@ -2,10 +2,10 @@ package autocart.navigation;
 
 component PathPlaner(Q(0:1:oo) n){
     port
-        in Q(-1:1:oo) destination,
-        in Q(-1:1:oo) start,
+        in (-1:1:oo) destination,
+        in (-1:1:oo) start,
         in Q^{n,n} distMatrix,
-        in Q(-1:1:n) curPathIndex,
-        in Q(-1:1:n) prevPathIndex,
-        out Q(-1:1:n) nextPathIndex;
+        in (-1:1:n) curPathIndex,
+        in (-1:1:n) prevPathIndex,
+        out (-1:1:n) nextPathIndex;
 }
\ No newline at end of file

src/test/resources/fas/demo_fas_Fkt_m/BrakeAssistant.ema

@@ -4,8 +4,8 @@ import fas.demo_fas_Fkt_m.brakeAssistant_m.Brake_Booster;
 
 component BrakeAssistant {
 	port
-		in Z(0:255) BrakeForce_pedal_pc,
-		out Z(0:255) BrakeForceBoosted_pc;
+		in (0:255) BrakeForce_pedal_pc,
+		out (0:255) BrakeForceBoosted_pc;
 
 	instance Brake_Booster brake;
 

src/test/resources/fas/demo_fas_Fkt_m/Distronic.ema

@@ -12,12 +12,12 @@ component Distronic {
 		in B CC_active_b,
 		in (0m/s:0.28m/s:1820.39m/s) V_Vehicle_ms,
 		in (0m:1m:200m) Distance_Object_m,
-		in Z(0:255) Distance_stat,
+		in (0:255) Distance_stat,
 		in (0m/s:0.28m/s:1820.39m/s) V_Obj_rel_kmh,
 		in B FTS_active_b,
 		in (0m:200m) FTS_Abstand_soll_m,
-		out Z(0:255) BrakeForce_Distronic_pc,
-		out Z(0:255) Decelerator_pc;
+		out (0:255) BrakeForce_Distronic_pc,
+		out (0:255) Decelerator_pc;
 
 	instance SwitchB<Z(0:255)> switch1, switch2, switch3, switch4, switch5, switch6;
 	instance And and1, and2, and3, and4, and5;

src/test/resources/fas/demo_fas_Fkt_m/Distronic_edited.ema

@@ -13,12 +13,12 @@ component Distronic_edited {
 		in B CC_active_b,
 		in (0m/s:0.28m/s:1820.39m/s) V_Vehicle_ms,
 		in (0m:1m:200m) Distance_Object_m,
-		in Z(0:255) Distance_stat,
+		in (0:255) Distance_stat,
 		in (0m/s:0.28m/s:1820.39m/s) V_Obj_rel_kmh,
 		in B FTS_active_b,
 		in (0m:200m) FTS_Abstand_soll_m,
-		out Z(0:255) BrakeForce_Distronic_pc,
-		out Z(0:255) Decelerator_pc;
+		out (0:255) BrakeForce_Distronic_pc,
+		out (0:255) Decelerator_pc;
 
 	instance SwitchB<Z(0:255)> switch1, switch2, switch3, switch4, switch5, switch6;
 	instance And and1, and2, and3, and4, and5;

src/test/resources/fas/demo_fas_Fkt_m/EmergencyBrake.ema

@@ -9,7 +9,7 @@ component EmergencyBrake {
 		in (0m:1m:200m) Distance_Object_m,
 		in (0m/s:0.28m/s:1820.39m/s) V_Obj_rel_ms,
 		in B cond,
-		out Z(0:255) BrakeForce_Emergency_pc,
+		out (0:255) BrakeForce_Emergency_pc,
 		out B Acusti_warn_b;
 
 	instance EmergencyBrake_Function eBrake_Function;

src/test/resources/fas/demo_fas_Fkt_m/FAS.ema

@@ -6,23 +6,23 @@ component FAS {
     port
         in B ParkingBrake_b,
         // Winkel BrakeForce_pedal = (0°:0.2°:45°), codiert in 8-bit
-        in Z(0:255) BrakeForce_pedal_pc, // BRMS_STATUS
+        in (0:255) BrakeForce_pedal_pc, // BRMS_STATUS
         // Winkel Accelaration_pedal = (0°:0.2°:45°)
-	    in Z(0:255) Accelaration_pedal_pc, // GAS_STATUS
+	    in (0:255) Accelaration_pedal_pc, // GAS_STATUS
         in B CruiseControl_b,
 		in B Limiter_b,
-		in Z(0:7) LeverUp_stat, // TMP_POS
-		in Z(0:7) LeverDown_stat, // TMP_POS
+		in (0:7) LeverUp_stat, // TMP_POS
+		in (0:7) LeverDown_stat, // TMP_POS
         // Geschwindigkeit = (0km/h:0.1km/h:6553.4km/h)
 		in (0m/s:0.28m/s:1820.39m/s) V_Vehicle_kmh, // R_Fahrzeuggeschwindigkeit_kmh
-		in Z(0:255) V_Sign_kmh, // R_TrafficSign, 8-bit Datenstruktur
+		in (0:255) V_Sign_kmh, // R_TrafficSign, 8-bit Datenstruktur
 		in B Sign_b,
-		in Z(0:255) Distance_stat, // RDR_DETECT, 8-bit Datenstruktur
+		in (0:255) Distance_stat, // RDR_DETECT, 8-bit Datenstruktur
         in (0m/s:2.8m/s:1820.39m/s) V_Obj_rel_kmh,
         in (0m:1m:200m) Distance_Object_m, // siehe: RDR_DETECT
         out B CC_active_b,
-        out Z(0:255) Accelaration_pc,
-        out Z(0:255) BrakeForce_pc,
+        out (0:255) Accelaration_pc,
+        out (0:255) BrakeForce_pc,
         out (0m/s:2.8m/s:1820.39m/s) CCSetValue_kmh,
         out (0m/s:2.8m/s:1820.39m/s) LimiterSetValue_kmh,
         out B Limiter_active_b,

src/test/resources/fas/demo_fas_Fkt_m/Limiter.ema

@@ -6,11 +6,11 @@ import fas.demo_fas_Fkt_m.lim_m.Limiter_Function;
 component Limiter {
 	port
 		in B Limiter_b,
-		in Z(0:255) Accelaration_pedal_pc,
+		in (0:255) Accelaration_pedal_pc,
 		in (0m/s:0.28m/s:1820.39m/s) V_Vehicle_kmh,
-		in Z(0:7) LeverUp_stat,
-		in Z(0:7) LeverDown_stat,
-		in Z(0:255) V_Sign_kmh,
+		in (0:7) LeverUp_stat,
+		in (0:7) LeverDown_stat,
+		in (0:255) V_Sign_kmh,
 		in B Sign_b,
 		out (0m/s:0.28m/s:1820.39m/s) VMax_kmh,
 		out B Limiter_active_b,

src/test/resources/fas/demo_fas_Fkt_m/Limiter_edited.ema

@@ -6,11 +6,11 @@ import fas.demo_fas_Fkt_m.lim_m.Limiter_Function_edited;
 component Limiter_edited {
 	port
 		in B Limiter_b,
-	    in Z(0:255) Accelaration_pedal_pc,
+	    in (0:255) Accelaration_pedal_pc,
 		in (0m/s:0.28m/s:1820.39m/s) V_Vehicle_kmh,
-		in Z(0:7) LeverUp_stat,
-		in Z(0:7) LeverDown_stat,
-		in Z(0:255) V_Sign_kmh,
+		in (0:7) LeverUp_stat,
+		in (0:7) LeverDown_stat,
+		in (0:255) V_Sign_kmh,
 		in B Sign_b,
 		in B Enable,
 		out (0m/s:0.28m/s:1820.39m/s) VMax_kmh,

src/test/resources/fas/demo_fas_Fkt_m/Tempomat.ema

@@ -6,13 +6,13 @@ import fas.demo_fas_Fkt_m.tem_m.Tempomat_Function;
 component Tempomat {
 	port
 		in B ParkingBrake_b,
-	    in Z(0:255) BrakeForce_pedal_pc,
+	    in (0:255) BrakeForce_pedal_pc,
 		in B CruiseControl_b,
 		in (0m/s:0.28m/s:1820.39m/s) V_Vehicle_kmh,
 		in B Limiter_b,
 		in B FTS_active_b,
-		in Z(0:7) LeverUp_Stat,
-		in Z(0:7) LeverDown_Stat,
+		in (0:7) LeverUp_Stat,
+		in (0:7) LeverDown_Stat,
 		out (0m/s:0.28m/s:1820.39m/s) V_CC_delta_kmh,
 		out B CC_active_b;
 

src/test/resources/fas/demo_fas_Fkt_m/Tempomat_edited.ema

@@ -6,13 +6,13 @@ import fas.demo_fas_Fkt_m.tem_m.Tempomat_Function_edited;
 component Tempomat_edited {
 	port
 		in B ParkingBrake_b,
-	    in Z(0:255) BrakeForce_pedal_pc,
+	    in (0:255) BrakeForce_pedal_pc,
 		in B CruiseControl_b,
 		in (0m/s:0.28m/s:1820.39m/s) V_Vehicle_kmh,
 		in B Limiter_b,
 		in B FTS_active_b,
-		in Z(0:7) LeverUp_Stat,
-		in Z(0:7) LeverDown_Stat,
+		in (0:7) LeverUp_Stat,
+		in (0:7) LeverDown_Stat,
 		in B Enable,
 		out (0m/s:0.28m/s:1820.39m/s) V_CC_delta_kmh,
 		out B CC_active_b;

src/test/resources/fas/demo_fas_Fkt_m/VelocityControl.ema

@@ -4,17 +4,17 @@ import fas.basicLibrary.*;
 
 component VelocityControl {
 	port
-		in Z(0:255) BrakeForceBoosted_pc,
+		in (0:255) BrakeForceBoosted_pc,
 		in (-1820.39m/s:0.28m/s:1820.39m/s) V_CC_delta_kmh,
 		in (0m/s:0.28m/s:1820.39m/s) VMax_kmh,
-		in Z(0:255) Accelaration_pedal_pc,
+		in (0:255) Accelaration_pedal_pc,
 		in (0m/s:0.28m/s:1820.39m/s) V_Vehicle_kmh,
-		in Z(0:255) BrakeForce_pedal_pc,
-		in Z(0:255) BrakeForce_Distronic_pc,
-		in Z(0:255) Decelerator_pc,
-		in Z(0:255) BrakeForce_Emergency_pc,
-		out Z(0:255) Accelaration_pc,
-		out Z(0:255) BrakeForce_pc;
+		in (0:255) BrakeForce_pedal_pc,
+		in (0:255) BrakeForce_Distronic_pc,
+		in (0:255) Decelerator_pc,
+		in (0:255) BrakeForce_Emergency_pc,
+		out (0:255) Accelaration_pc,
+		out (0:255) BrakeForce_pc;
 
 	instance Saturation<(-1820.39m/s:0.28m/s:1820.39m/s)> sat1, sat2;
 	instance LookUpM<(0m/s:0.28m/s:1820.39m/s),Z(0:100)> look1,look2;

src/test/resources/fas/demo_fas_Fkt_m/brakeAssistant_m/Brake_Booster.ema

@@ -5,8 +5,8 @@ import fas.basicLibrary.*;
 component Brake_Booster {
 
 	port
-		in Z(0:255) BrakeForce_pedal_pc,
-		out Z(0:255) BrakeForceBoosted_pc;
+		in (0:255) BrakeForce_pedal_pc,
+		out (0:255) BrakeForceBoosted_pc;
 
 	instance GreaterEquals<Z(0:255)> greaterEq;
 	instance SwitchB<Z(0:255)> switch1;

src/test/resources/fas/demo_fas_Fkt_m/distronic_m/Distronic_Deactive.ema

@@ -4,8 +4,8 @@ import fas.basicLibrary.*;
 
 component Distronic_Deactive {
 	port
-		out Z(0:255) BrakeForce_Distronic_pc,
-		out Z(0:255) Decelerator_pc;
+		out (0:255) BrakeForce_Distronic_pc,
+		out (0:255) Decelerator_pc;
 
 	connect 0 -> BrakeForce_Distronic_pc;
 	connect 100 -> Decelerator_pc;

src/test/resources/fas/demo_fas_Fkt_m/distronic_m/Distronic_Disabled.ema

@@ -4,8 +4,8 @@ import fas.basicLibrary.*;
 
 component Distronic_Disabled {
 	port
-		out Z(0:255) BrakeForce_Distronic_pc,
-		out Z(0:255) Decelerator_pc;
+		out (0:255) BrakeForce_Distronic_pc,
+		out (0:255) Decelerator_pc;
 
 
 	connect 0 -> BrakeForce_Distronic_pc;

src/test/resources/fas/demo_fas_Fkt_m/distronic_m/Distronic_Enabled.ema

@@ -6,10 +6,10 @@ component Distronic_Enabled {
 	port
 		in (0m/s:0.28m/s:1820.39m/s) V_Vehicle_ms,
 		in (0m:200m) Distance_Object_m,
-		in Z(0:255) Distance_stat,
+		in (0:255) Distance_stat,
 		in (-1820.39m/s:0.28m/s:1820.39m/s) V_Obj_rel_kmh,
-		out Z(0:255) BrakeForce_Distronic_pc,
-		out Z(0:255) Decelerator_pc;
+		out (0:255) BrakeForce_Distronic_pc,
+		out (0:255) Decelerator_pc;
 
 	instance SwitchMultiport<Q(0:255),3> switch1;
 	instance SwitchB<Z(0:255)> switch2;

src/test/resources/fas/demo_fas_Fkt_m/distronic_m/Distronic_FTS_Enabled.ema

@@ -7,8 +7,8 @@ component Distronic_FTS_Enabled {
 		in (0m:200m) Distance_Object_m,
 		in (0m:200m) FTS_Abstand_soll_m,
 		in (-1820.39m/s:0.28m/s:1820.39m/s) V_Obj_rel_kmh,
-		out Z(0:255) BrakeForce_Distronic_pc,
-		out Z(0:255) Decelerator_pc;
+		out (0:255) BrakeForce_Distronic_pc,
+		out (0:255) Decelerator_pc;
 
 	instance PlusMinus<(0m:200m)> plusMinus1;
 	instance LookUpM<(-1820.39m/s:0.28m/s:1820.39m/s),Z(0:255)> look1, look2;

src/test/resources/fas/demo_fas_Fkt_m/emergencyBrake_m/EmergencyBrake_Function.ema

@@ -7,7 +7,7 @@ component EmergencyBrake_Function {
 		in (0m/s:0.28m/s:1820.39m/s) V_Vehicle_ms,
 		in (0m:200m) Distance_Object_m,
 		in (-1820.39m/s:0.28m/s:1820.39m/s) V_Obj_rel_ms,
-		out Z(0:255) BrakeForce_Emergency_pc,
+		out (0:255) BrakeForce_Emergency_pc,
 		out B Acusti_warn_b;
 
 	instance Saturation<(1m/s:0.28m/s:1820.39m/s)> sat1, sat2, sat3;

src/test/resources/fas/demo_fas_Fkt_m/lim_m/Limiter_Function.ema

@@ -11,11 +11,11 @@ import fas.demo_fas_Fkt_m.lim_m.lim_Fkt_m.Limiter_InitialSetValue;
 component Limiter_Function {
 	port
 		in B Limiter_b,
-		in Z(0:255) Accelaration_pedal_pc,
+		in (0:255) Accelaration_pedal_pc,
 		in (0m/s:0.28m/s:1820.39m/s) V_Vehicle_kmh,
-		in Z(0:7) LeverUp_stat,
-		in Z(0:7) LeverDown_stat,
-		in Z(0:255) V_Sign_kmh,
+		in (0:7) LeverUp_stat,
+		in (0:7) LeverDown_stat,
+		in (0:255) V_Sign_kmh,
 		in B Sign_b,
 		in B Enable,
 		out (0m/s:0.28m/s:1820.39m/s) VMax_kmh,