From e6209c2a7a45ac1f8936c2e35834c10001fa7900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20W=2E=20V=2E=20Tran-J=C3=B8rgensen?= Date: Wed, 9 Aug 2017 11:42:38 +0200 Subject: [PATCH] Address misnomer, rename newMapVarToGrow to newMapVar #106 --- c/vdmclib/src/main/VdmMap.c | 4 ++-- c/vdmclib/src/main/VdmMap.h | 4 ++-- c/vdmclib/src/test/ExpressionsMap_Tests.cpp | 12 ++++++------ c/vdmclib/src/test/ExpressionsSeq_Tests.cpp | 2 +- .../java/org/overture/codegen/vdm2c/ColTrans.java | 2 +- .../transformations/GarbageCollectionTrans.java | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/c/vdmclib/src/main/VdmMap.c b/c/vdmclib/src/main/VdmMap.c index 6288950c..5607f508 100644 --- a/c/vdmclib/src/main/VdmMap.c +++ b/c/vdmclib/src/main/VdmMap.c @@ -111,7 +111,7 @@ TVP newMapGC(TVP *from) /* Not a very useful function, but here to support the map comprehension mechanism. */ -TVP newMapVarToGrow(size_t size, size_t expected_size, ...) +TVP newMapVar(size_t size, size_t expected_size, ...) { struct Map* ptr; TVP key; @@ -149,7 +149,7 @@ TVP newMapVarToGrow(size_t size, size_t expected_size, ...) } /* Not a very useful function, but here to support the map comprehension mechanism. */ -TVP newMapVarToGrowGC(size_t size, size_t expected_size, TVP *from, ...) +TVP newMapVarGC(size_t size, size_t expected_size, TVP *from, ...) { struct Map* ptr; TVP key; diff --git a/c/vdmclib/src/main/VdmMap.h b/c/vdmclib/src/main/VdmMap.h index 7b7ed793..dba7feb7 100644 --- a/c/vdmclib/src/main/VdmMap.h +++ b/c/vdmclib/src/main/VdmMap.h @@ -59,8 +59,8 @@ struct Map* cloneMap(struct Map *m); void vdmMapAdd(TVP map,TVP key, TVP value); void vdmMapUpdate(TVP map, TVP key, TVP value); -TVP newMapVarToGrow(size_t, size_t, ...); -TVP newMapVarToGrowGC(size_t size, size_t expected_size, TVP *from, ...); +TVP newMapVar(size_t, size_t, ...); +TVP newMapVarGC(size_t size, size_t expected_size, TVP *from, ...); void vdmMapGrow(TVP, TVP, TVP); void vdmMapFit(TVP); diff --git a/c/vdmclib/src/test/ExpressionsMap_Tests.cpp b/c/vdmclib/src/test/ExpressionsMap_Tests.cpp index 3b5081c0..5426324d 100644 --- a/c/vdmclib/src/test/ExpressionsMap_Tests.cpp +++ b/c/vdmclib/src/test/ExpressionsMap_Tests.cpp @@ -400,16 +400,16 @@ TEST(Expression_Map, mapEquals1) TEST(Expression_Map, mapEquals2) { // {1 |-> 2} - TVP m1 = newMapVarToGrow(1, 5, newInt(1), newInt(2)); + TVP m1 = newMapVar(1, 5, newInt(1), newInt(2)); // {3 |-> 4} - TVP m2 = newMapVarToGrow(1, 5, newInt(3), newInt(4)); + TVP m2 = newMapVar(1, 5, newInt(3), newInt(4)); // m1 union m2 TVP mapUnionResult = vdmMapMunion(m1,m2); // {1 |-> 2, 3 |-> 4} - TVP expectedResult = newMapVarToGrow(2, 5, newInt(3), newInt(4), newInt(1), newInt(2)); + TVP expectedResult = newMapVar(2, 5, newInt(3), newInt(4), newInt(1), newInt(2)); TVP res = vdmEquals(mapUnionResult, expectedResult); bool b = res->value.boolVal; @@ -425,16 +425,16 @@ TEST(Expression_Map, mapEquals2) -TEST(Expression_Map, newMapVarToGrow) +TEST(Expression_Map, newMapVar) { TVP theMap; TVP val; TVP res; - theMap = newMapVarToGrow(0, 10); + theMap = newMapVar(0, 10); vdmFree(theMap); - theMap = newMapVarToGrow(3, 10, newChar('a'), newInt(1), newChar('b'), newInt(2), newChar('c'), newInt(3)); + theMap = newMapVar(3, 10, newChar('a'), newInt(1), newChar('b'), newInt(2), newChar('c'), newInt(3)); val = vdmMapApply(theMap, newChar('a')); res = vdmEquals(val, newInt(1)); diff --git a/c/vdmclib/src/test/ExpressionsSeq_Tests.cpp b/c/vdmclib/src/test/ExpressionsSeq_Tests.cpp index e0a4a8b7..91717d4c 100644 --- a/c/vdmclib/src/test/ExpressionsSeq_Tests.cpp +++ b/c/vdmclib/src/test/ExpressionsSeq_Tests.cpp @@ -298,7 +298,7 @@ TEST(Expression_Seq, seqMod) TVP s = newSequence(2,arr); - TVP m = newMapVarToGrow(2, 5, newInt(1), newInt(5), newInt(2), newInt(10)) ; + TVP m = newMapVar(2, 5, newInt(1), newInt(5), newInt(2), newInt(10)) ; TVP res = vdmSeqMod(s,m); 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 index 883e988f..fdf8bb9e 100644 --- a/core/vdm2c/src/main/java/org/overture/codegen/vdm2c/ColTrans.java +++ b/core/vdm2c/src/main/java/org/overture/codegen/vdm2c/ColTrans.java @@ -20,7 +20,7 @@ public class ColTrans extends DepthFirstAnalysisCAdaptor implements IApplyAssist public static final String SEQ_VAR = "newSeqVar"; public static final String SET_VAR = "newSetVar"; - public static final String MAP_VAR = "newMapVarToGrow"; + public static final String MAP_VAR = "newMapVar"; // Sequence operations public static final String SEQ_TAIL = "vdmSeqTl"; diff --git a/core/vdm2c/src/main/java/org/overture/codegen/vdm2c/transformations/GarbageCollectionTrans.java b/core/vdm2c/src/main/java/org/overture/codegen/vdm2c/transformations/GarbageCollectionTrans.java index b968018b..3148f5cb 100644 --- a/core/vdm2c/src/main/java/org/overture/codegen/vdm2c/transformations/GarbageCollectionTrans.java +++ b/core/vdm2c/src/main/java/org/overture/codegen/vdm2c/transformations/GarbageCollectionTrans.java @@ -84,7 +84,7 @@ public void initNames() // Collections gcNames.put(ColTrans.SEQ_VAR, "newSeqVarGC"); gcNames.put(ColTrans.SET_VAR, "newSetVarGC"); - gcNames.put(ColTrans.MAP_VAR, "newMapVarToGrowGC"); + gcNames.put(ColTrans.MAP_VAR, "newMapVarGC"); // Sequence operations gcNames.put(ColTrans.SEQ_TAIL, "vdmSeqTlGC"); @@ -194,8 +194,8 @@ private void changeToGcCall(SExpIR node, LinkedList args, } else if(isMap(oldName) || isSetVarToGrow(oldName)) { - // The signature of 'newMapVarToGrowGC' is: - // TVP newMapVarToGrowGC(size_t size, size_t expected_size, TVP *from, ...); + // The signature of 'newMapVarGC' is: + // TVP newMapVarGC(size_t size, size_t expected_size, TVP *from, ...); // TVP newSetVarToGrowGC(size_t size, size_t expected_size, TVP *from, ...) // Therefore, 'from' is the third argument (at index 2) args.add(2, consReference(node));