WIP adding token type support.

overturetool · Mar 30, 2017 · 0da16de · 0da16de
1 parent 7c8f77d
commit 0da16de
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 20 deletions.
diff --git a/c/vdmclib/src/main/TypedValue.c b/c/vdmclib/src/main/TypedValue.c
@@ -85,6 +85,22 @@ TVP newQuote(unsigned int x)
 			{ .quoteVal = x });
 }
 
+TVP newToken(TVP x)
+{
+	char *str = unpackString(x);
+	int hashVal = 5381;
+	int c;
+
+	while (c = *str++)
+		hashVal = ((hashVal << 2) + hashVal) + c;
+
+	free(str);
+
+	return newTypeValue(VDM_TOKEN, (TypedValueType
+	)
+			{ .intVal = hashVal });
+}
+
 TVP newCollection(size_t size, vdmtype type)
 {
 	struct Collection* ptr = (struct Collection*) malloc(sizeof(struct Collection));
@@ -575,36 +591,36 @@ void vdmFree(TVP ptr)
 #ifndef NO_PRODUCTS
 	case VDM_PRODUCT:
 	{
-			UNWRAP_COLLECTION(cptr, ptr);
-			for (int i = 0; i < cptr->size; i++)
+		UNWRAP_COLLECTION(cptr, ptr);
+		for (int i = 0; i < cptr->size; i++)
+		{
+			if (cptr->value[i] != NULL)
 			{
-				if (cptr->value[i] != NULL)
-				{
-					vdmFree(cptr->value[i]);
-				}
+				vdmFree(cptr->value[i]);
 			}
-			free(cptr->value);
-			free(cptr);
-			ptr->value.ptr = NULL;
-			break;
 		}
+		free(cptr->value);
+		free(cptr);
+		ptr->value.ptr = NULL;
+		break;
+	}
 #endif
 #ifndef NO_SEQS
 	case VDM_SEQ:
 	{
-			UNWRAP_COLLECTION(cptr, ptr);
-			for (int i = 0; i < cptr->size; i++)
+		UNWRAP_COLLECTION(cptr, ptr);
+		for (int i = 0; i < cptr->size; i++)
+		{
+			if (cptr->value[i] != NULL)
 			{
-				if (cptr->value[i] != NULL)
-				{
-					vdmFree(cptr->value[i]);
-				}
+				vdmFree(cptr->value[i]);
 			}
-			free(cptr->value);
-			free(cptr);
-			ptr->value.ptr = NULL;
-			break;
 		}
+		free(cptr->value);
+		free(cptr);
+		ptr->value.ptr = NULL;
+		break;
+	}
 #endif
 #ifndef NO_SETS
 	case VDM_SET:

diff --git a/c/vdmclib/src/main/TypedValue.h b/c/vdmclib/src/main/TypedValue.h
@@ -71,6 +71,7 @@ typedef enum
 #ifndef NO_RECORDS
 	VDM_RECORD,
 #endif
+	VDM_TOKEN,
 	VDM_CLASS
 } vdmtype;
 
@@ -160,6 +161,7 @@ TVP newBool(bool x);
 TVP newReal(double x);
 TVP newChar(char x);
 TVP newQuote(unsigned int x);
+TVP newToken(TVP x);
 
 
 

diff --git a/c/vdmclib/src/main/VdmGC.c b/c/vdmclib/src/main/VdmGC.c
@@ -214,25 +214,44 @@ TVP newBoolGC(bool x, TVP *from)
 	)
 			{ .boolVal = x }, from);
 }
+
 TVP newRealGC(double x, TVP *from)
 {
 	return newTypeValueGC(VDM_REAL, (TypedValueType
 	)
 			{ .doubleVal = x }, from);
 }
+
 TVP newCharGC(char x, TVP *from)
 {
 	return newTypeValueGC(VDM_CHAR, (TypedValueType
 	)
 			{ .charVal = x }, from);
 }
+
 TVP newQuoteGC(unsigned int x, TVP *from)
 {
 	return newTypeValueGC(VDM_QUOTE, (TypedValueType
 	)
 			{ .quoteVal = x }, from);
 }
 
+TVP newTokenGC(TVP x, TVP *from)
+{
+	char *str = unpackString(x);
+	int hashVal = 5381;
+	int c;
+
+	while (c = *str++)
+		hashVal = ((hashVal << 2) + hashVal) + c;
+
+	free(str);
+
+	return newTypeValueGC(VDM_TOKEN, (TypedValueType
+	)
+			{ .intVal = hashVal }, from);
+}
+
 TVP newCollectionGC(size_t size, vdmtype type)
 {
 	struct Collection* ptr = (struct Collection*) malloc(sizeof(struct Collection));

diff --git a/c/vdmclib/src/main/VdmGC.h b/c/vdmclib/src/main/VdmGC.h
@@ -2,6 +2,7 @@
 #define VDMGC_H_
 
 #include "Vdm.h"
+#include "VdmUnpackString.h"
 
 struct alloc_list_node
 {
@@ -31,6 +32,7 @@ TVP newBoolGC(bool x, TVP *from);
 TVP newRealGC(double x, TVP *from);
 TVP newCharGC(char x, TVP *from);
 TVP newQuoteGC(unsigned int x, TVP *from);
+TVP newTokenGC(TVP x, TVP *from);
 TVP vdmEqualsGC(TVP a, TVP b, TVP *from);
 //#endif /* WITH_GC */