Merge pull request #4125 from yebblies/traitstable

[DDMD] Change traits table back to using a sentinel value
dlang · Nov 10, 2014 · ca4a50d · ca4a50d
2 parents 452cfcc + 7fd7147
commit ca4a50d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/traits.c b/src/traits.c
@@ -253,19 +253,20 @@ const char* traits[] = {
     "getAttributes",
     "getFunctionAttributes",
     "getUnitTests",
-    "getVirtualIndex"
+    "getVirtualIndex",
+    NULL
 };
 
 StringTable traitsStringTable;
 
 void initTraitsStringTable()
 {
-    const size_t ntraits = sizeof(traits) / sizeof(traits[0]);
-    traitsStringTable._init(ntraits);
+    traitsStringTable._init(40);
 
-    for (size_t idx = 0; idx < ntraits; idx++)
+    for (size_t idx = 0;; idx++)
     {
         const char *s = traits[idx];
+        if (!s) break;
         StringValue *sv = traitsStringTable.insert(s, strlen(s));
         sv->ptrvalue = (void *)traits[idx];
     }