WIP

Author: byroot

ext/json/ext/generator/generator.c

@@ -986,16 +986,10 @@ static inline VALUE vstate_get(struct generate_json_data *data)
     return data->vstate;
 }
 
-enum key_types {
-    KEY_UNKNOWN,
-    KEY_SYMBOL,
-    KEY_STRING,
-};
-
 struct hash_foreach_arg {
     VALUE hash;
     struct generate_json_data *data;
-    enum key_types keys;
+    int first_key_type;
     bool first;
 };
 
@@ -1025,8 +1019,11 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
 
     long depth = state->depth;
 
-    if (RB_UNLIKELY(arg->first)) {
+    int key_type = rb_type(key);
+
+    if (arg->first) {
         arg->first = false;
+        arg->first_key_type = key_type;
     }
     else {
         fbuffer_append_char(buffer, ',');
@@ -1043,13 +1040,10 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
     bool as_json_called = false;
 
   start:
-    switch (rb_type(key)) {
+    switch (key_type) {
         case T_STRING:
-            if (arg->keys == KEY_UNKNOWN) {
-                arg->keys = KEY_STRING;
-            }
-            else if (RB_UNLIKELY(arg->keys == KEY_SYMBOL)) {
-                fprintf(stderr, "mixed keys\n");
+            if (RB_UNLIKELY(arg->first_key_type != T_STRING)) {
+                fprintf(stderr, "mixed keys (str)\n");
             }
 
             if (RB_LIKELY(RBASIC_CLASS(key) == rb_cString)) {
@@ -1059,11 +1053,8 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
             }
             break;
         case T_SYMBOL:
-            if (arg->keys == KEY_UNKNOWN) {
-                arg->keys = KEY_SYMBOL;
-            }
-            else if (RB_UNLIKELY(arg->keys == KEY_STRING)) {
-                fprintf(stderr, "mixed keys\n");
+            if (RB_UNLIKELY(arg->first_key_type != T_SYMBOL)) {
+                fprintf(stderr, "mixed keys (sym)\n");
             }
 
             key_to_s = rb_sym2str(key);
@@ -1072,6 +1063,7 @@ json_object_i(VALUE key, VALUE val, VALUE _arg)
             if (data->state->strict) {
                 if (RTEST(data->state->as_json) && !as_json_called) {
                     key = rb_proc_call_with_block(data->state->as_json, 1, &key, Qnil);
+                    key_type = rb_type(key);
                     as_json_called = true;
                     goto start;
                 } else {