Explorar o código

ncd: NCDAst: make NCDValue_MapPrepend return int instead of NCDValue *

ambrop7 %!s(int64=13) %!d(string=hai) anos
pai
achega
b3ad397377
Modificáronse 2 ficheiros con 5 adicións e 5 borrados
  1. 4 4
      ncd/NCDAst.c
  2. 1 1
      ncd/NCDAst.h

+ 4 - 4
ncd/NCDAst.c

@@ -252,7 +252,7 @@ size_t NCDValue_MapCount (NCDValue *o)
     return o->map_count;
 }
 
-NCDValue * NCDValue_MapPrepend (NCDValue *o, NCDValue key, NCDValue val)
+int NCDValue_MapPrepend (NCDValue *o, NCDValue key, NCDValue val)
 {
     value_assert(o);
     ASSERT(o->type == NCDVALUE_MAP)
@@ -260,12 +260,12 @@ NCDValue * NCDValue_MapPrepend (NCDValue *o, NCDValue key, NCDValue val)
     value_assert(&val);
     
     if (o->map_count == SIZE_MAX) {
-        return NULL;
+        return 0;
     }
     
     struct NCDValue__map_element *e = malloc(sizeof(*e));
     if (!e) {
-        return NULL;
+        return 0;
     }
     
     e->key = key;
@@ -274,7 +274,7 @@ NCDValue * NCDValue_MapPrepend (NCDValue *o, NCDValue key, NCDValue val)
     
     o->map_count++;
     
-    return &e->key;
+    return 1;
 }
 
 NCDValue * NCDValue_MapFirstKey (NCDValue *o)

+ 1 - 1
ncd/NCDAst.h

@@ -154,7 +154,7 @@ NCDValue * NCDValue_ListFirst (NCDValue *o);
 NCDValue * NCDValue_ListNext (NCDValue *o, NCDValue *ev);
 void NCDValue_InitMap (NCDValue *o);
 size_t NCDValue_MapCount (NCDValue *o);
-NCDValue * NCDValue_MapPrepend (NCDValue *o, NCDValue key, NCDValue val) WARN_UNUSED;
+int NCDValue_MapPrepend (NCDValue *o, NCDValue key, NCDValue val) WARN_UNUSED;
 NCDValue * NCDValue_MapFirstKey (NCDValue *o);
 NCDValue * NCDValue_MapNextKey (NCDValue *o, NCDValue *ekey);
 NCDValue * NCDValue_MapKeyValue (NCDValue *o, NCDValue *ekey);