- Support for is seq1.

- Addresses #108.
overturetool · Oct 9, 2017 · ba7ac73 · ba7ac73
1 parent e484cc4
commit ba7ac73
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 25 deletions.
diff --git a/c/vdmclib/src/main/VdmBasicTypes.c b/c/vdmclib/src/main/VdmBasicTypes.c
@@ -214,24 +214,6 @@ bool isNumber(TVP val)
 	}
 }
 
-#ifndef NO_SEQS
-TVP isSeq(TVP v)
-{
-	if(v->type == VDM_SEQ)
-		return newBool(true);
-	return newBool(false);
-}
-#endif
-
-#ifndef NO_SETS
-TVP isSet(TVP v)
-{
-	if(v->type == VDM_SET)
-		return newBool(true);
-	return newBool(false);
-}
-#endif
-
 TVP isInt(TVP v)
 {
 	if(v->type == VDM_INT)
@@ -482,7 +464,7 @@ TVP is(TVP v, char ot[])
 	TVP isres;
 
 	/* No nesting inside sequence, set or record. */
-	if(ot[0] != 'Q' && ot[0] != 'T' && ot[0] != 'P')
+	if(ot[0] != 'Q' && ot[0] != 'T' && ot[0] != 'P' && ot[0] != 'Z' && ot[0] != 'Y')
 	{
 		switch(ot[0])
 		{
@@ -537,6 +519,23 @@ TVP is(TVP v, char ot[])
 			}
 		}
 	}
+	else if(ot[0] == 'Z')
+	{
+		if(v->type == VDM_SEQ)
+		{
+			if(((struct Collection *)(v->value.ptr))->size > 0)
+			{
+				res = true;
+
+				for(i = 0; i < ((struct Collection *)(v->value.ptr))->size; i++)
+				{
+					isres = is(((struct Collection *)(v->value.ptr))->value[i], &(ot[1]));
+					res &= isres->value.boolVal;
+					vdmFree(isres);
+				}
+			}
+		}
+	}
 #endif
 #ifndef NO_SETS
 	else if(ot[0] == 'T')

diff --git a/c/vdmclib/src/main/VdmBasicTypes.h b/c/vdmclib/src/main/VdmBasicTypes.h
@@ -93,12 +93,6 @@ TVP vdmLessOrEqualGC(TVP a, TVP b, TVP *from);
  */
 bool isNumber(TVP val);
 TVP isInt(TVP val);
-#ifndef NO_SEQS
-TVP isSeq(TVP val);
-#endif
-#ifndef NO_SETS
-TVP isSet(TVP val);
-#endif
 TVP isIntGC(TVP val, TVP *from);
 TVP isReal(TVP val);
 TVP isRealGC(TVP val, TVP *from);

diff --git a/c/vdmclib/src/test/Expressions_Tests.cpp b/c/vdmclib/src/test/Expressions_Tests.cpp
@@ -444,6 +444,26 @@ TEST(Expression, isSeqOfInt)
 	vdmFree(res);
 }
 
+TEST(Expression, isSeq1OfIntNegative)
+{
+	char ot[] = "Zi";
+	TVP res;
+
+	res = is(newSeqVar(0), ot);
+	EXPECT_FALSE(res->value.boolVal);
+	vdmFree(res);
+}
+
+TEST(Expression, isSeq1OfInt)
+{
+	char ot[] = "Zi";
+	TVP res;
+
+	res = is(newSeqVar(2, newInt(1), newInt(-2)), ot);
+	EXPECT_TRUE(res->value.boolVal);
+	vdmFree(res);
+}
+
 TEST(Expression, isSeqOfSeqOfInt)
 {
 	char ot[] = {'Q', 'Q', 'i'};