all repos — hex @ 8306c40e9a745a8b8441baa9b3ba770d1efe3357

A tiny, minimalist, slightly-esoteric concatenative programming lannguage. 

Fixes.
h3rald h3rald@h3rald.com
Sun, 24 Nov 2024 21:36:14 +0100
commit

8306c40e9a745a8b8441baa9b3ba770d1efe3357

parent

d3f5166978981dd5c7a558fb23009cc6e5caf1a1

1 files changed, 9 insertions(+), 13 deletions(-)

jump to
M hex.c → hex.c 
@@ -217,7 +217,6 @@ return 1;
             }
             free(HEX_REGISTRY[i].key);
             hex_free_element(HEX_REGISTRY[i].value);
-            value.symbolName = strdup(key);
             HEX_REGISTRY[i].key = strdup(key);
             HEX_REGISTRY[i].value = value;
             return 0;

@@ -227,7 +226,7 @@ 
     if (HEX_REGISTRY_COUNT >= HEX_REGISTRY_SIZE)
     {
         hex_error("Registry overflow");
-        free(value.symbolName);
+        hex_free_token(value.token);
         return 1;
     }
 

@@ -243,7 +242,6 @@ {
     HEX_StackElement funcElement;
     funcElement.type = HEX_TYPE_NATIVE_SYMBOL;
     funcElement.data.functionPointer = func;
-    funcElement.symbolName = strdup(name);
 
     if (hex_set_symbol(name, funcElement, 1) != 0)
     {

@@ -289,13 +287,13 @@ int result = 0;
     if (element.type == HEX_TYPE_USER_SYMBOL)
     {
         HEX_StackElement value;
-        if (hex_get_symbol(element.symbolName, &value))
+        if (hex_get_symbol(element.token->value, &value))
         {
             result = hex_push(value);
         }
         else
         {
-            hex_error("Undefined user symbol: %s", element.symbolName);
+            hex_error("Undefined user symbol: %s", element.token->value);
             hex_free_element(value);
             result = 1;
         }

@@ -453,15 +451,13 @@ }
         free(element.data.quotationValue);
         element.data.quotationValue = NULL;
     }
-    else if (element.type == HEX_TYPE_NATIVE_SYMBOL && element.symbolName != NULL)
+    else if (element.type == HEX_TYPE_NATIVE_SYMBOL && element.token->value != NULL)
     {
-        free(element.symbolName);
-        element.symbolName = NULL;
+        hex_free_token(element.token);
     }
-    else if (element.type == HEX_TYPE_USER_SYMBOL && element.symbolName != NULL)
+    else if (element.type == HEX_TYPE_USER_SYMBOL && element.token->value != NULL)
     {
-        free(element.symbolName);
-        element.symbolName = NULL;
+        hex_free_token(element.token);
     }
 }
 

@@ -951,7 +947,7 @@ fprintf(stream, "%s", element.data.strValue);
         break;
     case HEX_TYPE_USER_SYMBOL:
     case HEX_TYPE_NATIVE_SYMBOL:
-        fprintf(stream, "%s", element.symbolName);
+        fprintf(stream, "%s", element.token->value);
         break;
     case HEX_TYPE_QUOTATION:
         fprintf(stream, "(");

@@ -1031,7 +1027,7 @@ break;
 
     case HEX_TYPE_USER_SYMBOL:
     case HEX_TYPE_NATIVE_SYMBOL:
-        fprintf(stream, "%s", element.symbolName);
+        fprintf(stream, "%s", element.token->value);
         break;
 
     case HEX_TYPE_QUOTATION: