Support map iteration #108

overturetool · Oct 18, 2017 · 6c440d7 · 6c440d7
1 parent 4e7ab1e
commit 6c440d7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/core/vdm2c/src/main/java/org/overture/codegen/vdm2c/ColTrans.java b/core/vdm2c/src/main/java/org/overture/codegen/vdm2c/ColTrans.java
@@ -55,6 +55,7 @@ public class ColTrans extends DepthFirstAnalysisCAdaptor implements IApplyAssist
 	public static final String MAP_RES_DOM_BY = "vdmMapDomRestrictBy";
 	public static final String MAP_RES_RNG_TO = "vdmMapRngRestrictTo";
 	public static final String MAP_RES_RNG_BY = "vdmMapRngRestrictBy";
+	public static final String MAP_ITERATE = "vdmMapIterate";
 
 	private TransAssistantIR assist;
 
@@ -284,7 +285,13 @@ public void caseARangeResByBinaryExpIR(ARangeResByBinaryExpIR node) throws Analy
 
 		rewriteToApply(this, node, MAP_RES_RNG_BY, node.getLeft(), node.getRight());
 	}
-
+
+	@Override
+	public void caseAMapIterationBinaryExpIR(AMapIterationBinaryExpIR node) throws AnalysisException {
+
+		rewriteToApply(this, node, MAP_ITERATE, node.getLeft(), node.getRight());
+	}
+
 	private void rewriteColEnumToApply(SExpIR node, String seqVar, List<SExpIR> members)
 			throws AnalysisException {
 		AExternalTypeIR extType = new AExternalTypeIR();

diff --git a/...dm2c/src/main/java/org/overture/codegen/vdm2c/transformations/GarbageCollectionTrans.java b/...dm2c/src/main/java/org/overture/codegen/vdm2c/transformations/GarbageCollectionTrans.java
@@ -134,7 +134,8 @@ public void initNames()
 		gcNames.put(ColTrans.MAP_RES_DOM_BY, "vdmMapDomRestrictByGC");
 		gcNames.put(ColTrans.MAP_RES_RNG_TO, "vdmMapRngRestrictToGC");
 		gcNames.put(ColTrans.MAP_RES_RNG_BY, "vdmMapRngRestrictByGC");
-
+		gcNames.put(ColTrans.MAP_ITERATE, "vdmMapIterateGC");
+
 		// Tuples
 		gcNames.put(TupleTrans.TUPLE_EXP, "newProductVarGC");
 		gcNames.put(TupleTrans.TUPLE_FIELD_NUMBER_EXP, "productGetGC");

diff --git a/core/vdm2c/src/test/resources/native/map/ExpressionsMap_Tests.cpp b/core/vdm2c/src/test/resources/native/map/ExpressionsMap_Tests.cpp
@@ -82,3 +82,8 @@ TEST_F(TestFlowFunctions, mapRngResBy)
 {
 	CHECK(CLASS_ExpressionMap__Z16mapRestrictRngByEV);
 }
+
+TEST_F(TestFlowFunctions, mapIterate)
+{
+	CHECK(CLASS_ExpressionMap__Z12mapIterationEV);
+}
diff --git a/core/vdm2c/src/test/resources/vdmrt/expressions/ExpressionMap.vdmrt b/core/vdm2c/src/test/resources/vdmrt/expressions/ExpressionMap.vdmrt
@@ -45,4 +45,7 @@ mapRestrictRngTo () == {1 |-> 2, 2 |-> 3} :> {3} = {2 |-> 3};
 public mapRestrictRngBy :  () -> bool
 mapRestrictRngBy () == {1 |-> 2, 2 |-> 3} :-> {3} = {1 |-> 2};
 
+public mapIteration : () -> bool
+mapIteration () == {1 |-> 2, 2 |-> 1, 3 |-> 4, 4 |-> 3} ** 2 = {1 |-> 1, 2 |-> 2, 3 |-> 3, 4 |-> 4};
+
 end ExpressionMap