json 2.8.1 → 2.9.0

data/ext/json/ext/parser/parser.c

@@ -28,19 +28,6 @@ static const char deprecated_create_additions_warning[] =
     "and will be removed in 3.0, use JSON.unsafe_load or explicitly "
     "pass `create_additions: true`";
 
-#ifndef HAVE_RB_GC_MARK_LOCATIONS
-// For TruffleRuby
-void rb_gc_mark_locations(const VALUE *start, const VALUE *end)
-{
-    VALUE *value = start;
-
-    while (value < end) {
-        rb_gc_mark(*value);
-        value++;
-    }
-}
-#endif
-
 #ifndef HAVE_RB_HASH_BULK_INSERT
 // For TruffleRuby
 void rb_hash_bulk_insert(long count, const VALUE *pairs, VALUE hash)
@@ -266,7 +253,10 @@ static inline void rvalue_stack_pop(rvalue_stack *stack, long count)
 static void rvalue_stack_mark(void *ptr)
 {
     rvalue_stack *stack = (rvalue_stack *)ptr;
-    rb_gc_mark_locations(stack->ptr, stack->ptr + stack->head);
+    long index;
+    for (index = 0; index < stack->head; index++) {
+        rb_gc_mark(stack->ptr[index]);
+    }
 }
 
 static void rvalue_stack_free(void *ptr)
@@ -394,6 +384,7 @@ typedef struct JSON_ParserStruct {
     VALUE decimal_class;
     VALUE match_string;
     FBuffer fbuffer;
+    int in_array;
     int max_nesting;
     bool allow_nan;
     bool allow_trailing_comma;
@@ -422,8 +413,7 @@ static const rb_data_type_t JSON_Parser_type;
 static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result);
 static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting);
 static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting);
-static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result);
+static char *JSON_parse_number(JSON_Parser *json, char *p, char *pe, VALUE *result);
 static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting);
 
 
@@ -449,11 +439,11 @@ static void raise_parse_error(const char *format, const char *start)
 
 
 
-#line 475 "parser.rl"
+#line 465 "parser.rl"
 
 
 
-#line 457 "parser.c"
+#line 447 "parser.c"
 enum {JSON_object_start = 1};
 enum {JSON_object_first_final = 32};
 enum {JSON_object_error = 0};
@@ -461,7 +451,7 @@ enum {JSON_object_error = 0};
 enum {JSON_object_en_main = 1};
 
 
-#line 515 "parser.rl"
+#line 505 "parser.rl"
 
 
 #define PUSH(result) rvalue_stack_push(json->stack, result, &json->stack_handle, &json->stack)
@@ -477,14 +467,14 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
     long stack_head = json->stack->head;
 
 
-#line 481 "parser.c"
+#line 471 "parser.c"
 	{
 	cs = JSON_object_start;
 	}
 
-#line 530 "parser.rl"
+#line 520 "parser.rl"
 
-#line 488 "parser.c"
+#line 478 "parser.c"
 	{
 	short _widec;
 	if ( p == pe )
@@ -513,7 +503,7 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 494 "parser.rl"
+#line 484 "parser.rl"
 	{
         char *np;
         json->parsing_name = true;
@@ -529,7 +519,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 533 "parser.c"
+#line 523 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -596,7 +586,7 @@ case 8:
 		goto st8;
 	goto st0;
 tr11:
-#line 483 "parser.rl"
+#line 473 "parser.rl"
 	{
         char *np = JSON_parse_value(json, p, pe, result, current_nesting);
         if (np == NULL) {
@@ -610,20 +600,20 @@ st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 614 "parser.c"
+#line 604 "parser.c"
 	_widec = (*p);
 	if ( (*p) < 13 ) {
 		if ( (*p) > 9 ) {
 			if ( 10 <= (*p) && (*p) <= 10 ) {
 				_widec = (short)(128 + ((*p) - -128));
 				if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 			}
 		} else if ( (*p) >= 9 ) {
 			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else if ( (*p) > 13 ) {
@@ -631,26 +621,26 @@ case 9:
 			if ( 32 <= (*p) && (*p) <= 32 ) {
 				_widec = (short)(128 + ((*p) - -128));
 				if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 			}
 		} else if ( (*p) > 44 ) {
 			if ( 47 <= (*p) && (*p) <= 47 ) {
 				_widec = (short)(128 + ((*p) - -128));
 				if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 			}
 		} else {
 			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else {
 		_widec = (short)(128 + ((*p) - -128));
 		if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 	}
 	switch( _widec ) {
@@ -671,14 +661,14 @@ case 9:
 		goto st10;
 	goto st0;
 tr4:
-#line 505 "parser.rl"
+#line 495 "parser.rl"
 	{ p--; {p++; cs = 32; goto _out;} }
 	goto st32;
 st32:
 	if ( ++p == pe )
 		goto _test_eof32;
 case 32:
-#line 682 "parser.c"
+#line 672 "parser.c"
 	goto st0;
 st10:
 	if ( ++p == pe )
@@ -780,13 +770,13 @@ case 20:
 		if ( 47 <= (*p) && (*p) <= 47 ) {
 			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else if ( (*p) >= 42 ) {
 		_widec = (short)(128 + ((*p) - -128));
 		if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 	}
 	switch( _widec ) {
@@ -805,20 +795,20 @@ case 21:
 		if ( (*p) <= 41 ) {
 			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else if ( (*p) > 42 ) {
 		if ( 43 <= (*p) )
  {			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else {
 		_widec = (short)(128 + ((*p) - -128));
 		if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 	}
 	switch( _widec ) {
@@ -841,13 +831,13 @@ case 22:
 			if ( 42 <= (*p) && (*p) <= 42 ) {
 				_widec = (short)(128 + ((*p) - -128));
 				if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 			}
 		} else {
 			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else if ( (*p) > 46 ) {
@@ -855,19 +845,19 @@ case 22:
 			if ( 48 <= (*p) )
  {				_widec = (short)(128 + ((*p) - -128));
 				if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 			}
 		} else if ( (*p) >= 47 ) {
 			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else {
 		_widec = (short)(128 + ((*p) - -128));
 		if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 	}
 	switch( _widec ) {
@@ -891,20 +881,20 @@ case 23:
 		if ( (*p) <= 9 ) {
 			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else if ( (*p) > 10 ) {
 		if ( 11 <= (*p) )
  {			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else {
 		_widec = (short)(128 + ((*p) - -128));
 		if (
-#line 492 "parser.rl"
+#line 482 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 	}
 	switch( _widec ) {
@@ -1018,7 +1008,7 @@ case 31:
 	_out: {}
 	}
 
-#line 531 "parser.rl"
+#line 521 "parser.rl"
 
     if (cs >= JSON_object_first_final) {
         long count = json->stack->head - stack_head;
@@ -1069,7 +1059,7 @@ case 31:
 }
 
 
-#line 1073 "parser.c"
+#line 1063 "parser.c"
 enum {JSON_value_start = 1};
 enum {JSON_value_first_final = 29};
 enum {JSON_value_error = 0};
@@ -1077,7 +1067,7 @@ enum {JSON_value_error = 0};
 enum {JSON_value_en_main = 1};
 
 
-#line 666 "parser.rl"
+#line 654 "parser.rl"
 
 
 static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
@@ -1085,14 +1075,14 @@ static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *resul
     int cs = EVIL;
 
 
-#line 1089 "parser.c"
+#line 1079 "parser.c"
 	{
 	cs = JSON_value_start;
 	}
 
-#line 673 "parser.rl"
+#line 661 "parser.rl"
 
-#line 1096 "parser.c"
+#line 1086 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1126,7 +1116,7 @@ st0:
 cs = 0;
 	goto _out;
 tr2:
-#line 609 "parser.rl"
+#line 599 "parser.rl"
 	{
         char *np = JSON_parse_string(json, p, pe, result);
         if (np == NULL) {
@@ -1138,7 +1128,7 @@ tr2:
     }
 	goto st29;
 tr3:
-#line 619 "parser.rl"
+#line 609 "parser.rl"
 	{
         char *np;
         if(pe > p + 8 && !strncmp(MinusInfinity, p, 9)) {
@@ -1150,11 +1140,7 @@ tr3:
                 raise_parse_error("unexpected token at '%s'", p);
             }
         }
-        np = JSON_parse_float(json, p, pe, result);
-        if (np != NULL) {
-            {p = (( np))-1;}
-        }
-        np = JSON_parse_integer(json, p, pe, result);
+        np = JSON_parse_number(json, p, pe, result);
         if (np != NULL) {
             {p = (( np))-1;}
         }
@@ -1162,15 +1148,17 @@ tr3:
     }
 	goto st29;
 tr7:
-#line 641 "parser.rl"
+#line 627 "parser.rl"
 	{
         char *np;
+        json->in_array++;
         np = JSON_parse_array(json, p, pe, result, current_nesting + 1);
+        json->in_array--;
         if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
     }
 	goto st29;
 tr11:
-#line 647 "parser.rl"
+#line 635 "parser.rl"
 	{
         char *np;
         np =  JSON_parse_object(json, p, pe, result, current_nesting + 1);
@@ -1178,7 +1166,7 @@ tr11:
     }
 	goto st29;
 tr25:
-#line 602 "parser.rl"
+#line 592 "parser.rl"
 	{
         if (json->allow_nan) {
             *result = CInfinity;
@@ -1188,7 +1176,7 @@ tr25:
     }
 	goto st29;
 tr27:
-#line 595 "parser.rl"
+#line 585 "parser.rl"
 	{
         if (json->allow_nan) {
             *result = CNaN;
@@ -1198,19 +1186,19 @@ tr27:
     }
 	goto st29;
 tr31:
-#line 589 "parser.rl"
+#line 579 "parser.rl"
 	{
         *result = Qfalse;
     }
 	goto st29;
 tr34:
-#line 586 "parser.rl"
+#line 576 "parser.rl"
 	{
         *result = Qnil;
     }
 	goto st29;
 tr37:
-#line 592 "parser.rl"
+#line 582 "parser.rl"
 	{
         *result = Qtrue;
     }
@@ -1219,9 +1207,9 @@ st29:
 	if ( ++p == pe )
 		goto _test_eof29;
 case 29:
-#line 653 "parser.rl"
+#line 641 "parser.rl"
 	{ p--; {p++; cs = 29; goto _out;} }
-#line 1225 "parser.c"
+#line 1213 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st29;
 		case 32: goto st29;
@@ -1462,7 +1450,7 @@ case 28:
 	_out: {}
 	}
 
-#line 674 "parser.rl"
+#line 662 "parser.rl"
 
     if (json->freeze) {
         OBJ_FREEZE(*result);
@@ -1477,7 +1465,7 @@ case 28:
 }
 
 
-#line 1481 "parser.c"
+#line 1469 "parser.c"
 enum {JSON_integer_start = 1};
 enum {JSON_integer_first_final = 3};
 enum {JSON_integer_error = 0};
@@ -1485,7 +1473,7 @@ enum {JSON_integer_error = 0};
 enum {JSON_integer_en_main = 1};
 
 
-#line 695 "parser.rl"
+#line 683 "parser.rl"
 
 
 #define MAX_FAST_INTEGER_SIZE 18
@@ -1510,82 +1498,8 @@ static inline VALUE fast_parse_integer(char *p, char *pe)
     return LL2NUM(memo);
 }
 
-static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
+static char *JSON_decode_integer(JSON_Parser *json, char *p, VALUE *result)
 {
-    int cs = EVIL;
-
-
-#line 1519 "parser.c"
-	{
-	cs = JSON_integer_start;
-	}
-
-#line 724 "parser.rl"
-    json->memo = p;
-
-#line 1527 "parser.c"
-	{
-	if ( p == pe )
-		goto _test_eof;
-	switch ( cs )
-	{
-case 1:
-	switch( (*p) ) {
-		case 45: goto st2;
-		case 48: goto st3;
-	}
-	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st5;
-	goto st0;
-st0:
-cs = 0;
-	goto _out;
-st2:
-	if ( ++p == pe )
-		goto _test_eof2;
-case 2:
-	if ( (*p) == 48 )
-		goto st3;
-	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st5;
-	goto st0;
-st3:
-	if ( ++p == pe )
-		goto _test_eof3;
-case 3:
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st0;
-	goto tr4;
-tr4:
-#line 692 "parser.rl"
-	{ p--; {p++; cs = 4; goto _out;} }
-	goto st4;
-st4:
-	if ( ++p == pe )
-		goto _test_eof4;
-case 4:
-#line 1568 "parser.c"
-	goto st0;
-st5:
-	if ( ++p == pe )
-		goto _test_eof5;
-case 5:
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st5;
-	goto tr4;
-	}
-	_test_eof2: cs = 2; goto _test_eof;
-	_test_eof3: cs = 3; goto _test_eof;
-	_test_eof4: cs = 4; goto _test_eof;
-	_test_eof5: cs = 5; goto _test_eof;
-
-	_test_eof: {}
-	_out: {}
-	}
-
-#line 726 "parser.rl"
-
-    if (cs >= JSON_integer_first_final) {
         long len = p - json->memo;
         if (RB_LIKELY(len < MAX_FAST_INTEGER_SIZE)) {
             *result = fast_parse_integer(json->memo, p);
@@ -1596,37 +1510,35 @@ case 5:
             *result = rb_cstr2inum(FBUFFER_PTR(&json->fbuffer), 10);
         }
         return p + 1;
-    } else {
-        return NULL;
-    }
 }
 
 
-#line 1606 "parser.c"
+#line 1517 "parser.c"
 enum {JSON_float_start = 1};
-enum {JSON_float_first_final = 8};
+enum {JSON_float_first_final = 6};
 enum {JSON_float_error = 0};
 
 enum {JSON_float_en_main = 1};
 
 
-#line 755 "parser.rl"
+#line 735 "parser.rl"
 
 
-static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
+static char *JSON_parse_number(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
+    bool is_float = false;
 
 
-#line 1622 "parser.c"
+#line 1534 "parser.c"
 	{
 	cs = JSON_float_start;
 	}
 
-#line 762 "parser.rl"
+#line 743 "parser.rl"
     json->memo = p;
 
-#line 1630 "parser.c"
+#line 1542 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1635,10 +1547,10 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
 case 1:
 	switch( (*p) ) {
 		case 45: goto st2;
-		case 48: goto st3;
+		case 48: goto st6;
 	}
 	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st7;
+		goto st10;
 	goto st0;
 st0:
 cs = 0;
@@ -1648,24 +1560,42 @@ st2:
 		goto _test_eof2;
 case 2:
 	if ( (*p) == 48 )
-		goto st3;
+		goto st6;
 	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st7;
+		goto st10;
 	goto st0;
-st3:
+st6:
 	if ( ++p == pe )
-		goto _test_eof3;
-case 3:
+		goto _test_eof6;
+case 6:
 	switch( (*p) ) {
-		case 46: goto st4;
-		case 69: goto st5;
-		case 101: goto st5;
+		case 45: goto st0;
+		case 46: goto tr8;
+		case 69: goto tr9;
+		case 101: goto tr9;
 	}
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st0;
+	goto tr7;
+tr7:
+#line 727 "parser.rl"
+	{ p--; {p++; cs = 7; goto _out;} }
+	goto st7;
+st7:
+	if ( ++p == pe )
+		goto _test_eof7;
+case 7:
+#line 1589 "parser.c"
 	goto st0;
-st4:
+tr8:
+#line 728 "parser.rl"
+	{  is_float = true; }
+	goto st3;
+st3:
 	if ( ++p == pe )
-		goto _test_eof4;
-case 4:
+		goto _test_eof3;
+case 3:
+#line 1599 "parser.c"
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st8;
 	goto st0;
@@ -1674,87 +1604,86 @@ st8:
 		goto _test_eof8;
 case 8:
 	switch( (*p) ) {
-		case 69: goto st5;
-		case 101: goto st5;
+		case 69: goto st4;
+		case 101: goto st4;
 	}
 	if ( (*p) > 46 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st8;
 	} else if ( (*p) >= 45 )
 		goto st0;
-	goto tr9;
+	goto tr7;
 tr9:
-#line 749 "parser.rl"
-	{ p--; {p++; cs = 9; goto _out;} }
-	goto st9;
-st9:
-	if ( ++p == pe )
-		goto _test_eof9;
-case 9:
-#line 1695 "parser.c"
-	goto st0;
-st5:
+#line 728 "parser.rl"
+	{  is_float = true; }
+	goto st4;
+st4:
 	if ( ++p == pe )
-		goto _test_eof5;
-case 5:
+		goto _test_eof4;
+case 4:
+#line 1625 "parser.c"
 	switch( (*p) ) {
-		case 43: goto st6;
-		case 45: goto st6;
+		case 43: goto st5;
+		case 45: goto st5;
 	}
 	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st10;
+		goto st9;
 	goto st0;
-st6:
+st5:
 	if ( ++p == pe )
-		goto _test_eof6;
-case 6:
+		goto _test_eof5;
+case 5:
 	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st10;
+		goto st9;
 	goto st0;
-st10:
+st9:
 	if ( ++p == pe )
-		goto _test_eof10;
-case 10:
+		goto _test_eof9;
+case 9:
 	switch( (*p) ) {
 		case 69: goto st0;
 		case 101: goto st0;
 	}
 	if ( (*p) > 46 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st10;
+			goto st9;
 	} else if ( (*p) >= 45 )
 		goto st0;
-	goto tr9;
-st7:
+	goto tr7;
+st10:
 	if ( ++p == pe )
-		goto _test_eof7;
-case 7:
+		goto _test_eof10;
+case 10:
 	switch( (*p) ) {
-		case 46: goto st4;
-		case 69: goto st5;
-		case 101: goto st5;
+		case 45: goto st0;
+		case 46: goto tr8;
+		case 69: goto tr9;
+		case 101: goto tr9;
 	}
 	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st7;
-	goto st0;
+		goto st10;
+	goto tr7;
 	}
 	_test_eof2: cs = 2; goto _test_eof;
+	_test_eof6: cs = 6; goto _test_eof;
+	_test_eof7: cs = 7; goto _test_eof;
 	_test_eof3: cs = 3; goto _test_eof;
-	_test_eof4: cs = 4; goto _test_eof;
 	_test_eof8: cs = 8; goto _test_eof;
-	_test_eof9: cs = 9; goto _test_eof;
+	_test_eof4: cs = 4; goto _test_eof;
 	_test_eof5: cs = 5; goto _test_eof;
-	_test_eof6: cs = 6; goto _test_eof;
+	_test_eof9: cs = 9; goto _test_eof;
 	_test_eof10: cs = 10; goto _test_eof;
-	_test_eof7: cs = 7; goto _test_eof;
 
 	_test_eof: {}
 	_out: {}
 	}
 
-#line 764 "parser.rl"
+#line 745 "parser.rl"
 
     if (cs >= JSON_float_first_final) {
+        if (!is_float) {
+            return JSON_decode_integer(json, p, result);
+        }
         VALUE mod = Qnil;
         ID method_id = 0;
         if (json->decimal_class) {
@@ -1805,7 +1734,7 @@ case 7:
 
 
 
-#line 1809 "parser.c"
+#line 1738 "parser.c"
 enum {JSON_array_start = 1};
 enum {JSON_array_first_final = 22};
 enum {JSON_array_error = 0};
@@ -1813,7 +1742,7 @@ enum {JSON_array_error = 0};
 enum {JSON_array_en_main = 1};
 
 
-#line 841 "parser.rl"
+#line 825 "parser.rl"
 
 
 static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
@@ -1826,14 +1755,14 @@ static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *resul
     long stack_head = json->stack->head;
 
 
-#line 1830 "parser.c"
+#line 1759 "parser.c"
 	{
 	cs = JSON_array_start;
 	}
 
-#line 853 "parser.rl"
+#line 837 "parser.rl"
 
-#line 1837 "parser.c"
+#line 1766 "parser.c"
 	{
 	short _widec;
 	if ( p == pe )
@@ -1873,7 +1802,7 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 821 "parser.rl"
+#line 805 "parser.rl"
 	{
         VALUE v = Qnil;
         char *np = JSON_parse_value(json, p, pe, &v, current_nesting);
@@ -1888,12 +1817,12 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 1892 "parser.c"
+#line 1821 "parser.c"
 	_widec = (*p);
 	if ( 44 <= (*p) && (*p) <= 44 ) {
 		_widec = (short)(128 + ((*p) - -128));
 		if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 	}
 	switch( _widec ) {
@@ -1940,14 +1869,14 @@ case 7:
 		goto st3;
 	goto st7;
 tr4:
-#line 833 "parser.rl"
+#line 817 "parser.rl"
 	{ p--; {p++; cs = 22; goto _out;} }
 	goto st22;
 st22:
 	if ( ++p == pe )
 		goto _test_eof22;
 case 22:
-#line 1951 "parser.c"
+#line 1880 "parser.c"
 	goto st0;
 st8:
 	if ( ++p == pe )
@@ -2015,13 +1944,13 @@ case 13:
 			if ( 10 <= (*p) && (*p) <= 10 ) {
 				_widec = (short)(128 + ((*p) - -128));
 				if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 			}
 		} else if ( (*p) >= 9 ) {
 			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else if ( (*p) > 13 ) {
@@ -2029,19 +1958,19 @@ case 13:
 			if ( 47 <= (*p) && (*p) <= 47 ) {
 				_widec = (short)(128 + ((*p) - -128));
 				if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 			}
 		} else if ( (*p) >= 32 ) {
 			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else {
 		_widec = (short)(128 + ((*p) - -128));
 		if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 	}
 	switch( _widec ) {
@@ -2080,13 +2009,13 @@ case 14:
 		if ( 47 <= (*p) && (*p) <= 47 ) {
 			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else if ( (*p) >= 42 ) {
 		_widec = (short)(128 + ((*p) - -128));
 		if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 	}
 	switch( _widec ) {
@@ -2105,20 +2034,20 @@ case 15:
 		if ( (*p) <= 41 ) {
 			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else if ( (*p) > 42 ) {
 		if ( 43 <= (*p) )
  {			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else {
 		_widec = (short)(128 + ((*p) - -128));
 		if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 	}
 	switch( _widec ) {
@@ -2141,13 +2070,13 @@ case 16:
 			if ( 42 <= (*p) && (*p) <= 42 ) {
 				_widec = (short)(128 + ((*p) - -128));
 				if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 			}
 		} else {
 			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else if ( (*p) > 46 ) {
@@ -2155,19 +2084,19 @@ case 16:
 			if ( 48 <= (*p) )
  {				_widec = (short)(128 + ((*p) - -128));
 				if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 			}
 		} else if ( (*p) >= 47 ) {
 			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else {
 		_widec = (short)(128 + ((*p) - -128));
 		if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 	}
 	switch( _widec ) {
@@ -2191,20 +2120,20 @@ case 17:
 		if ( (*p) <= 9 ) {
 			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else if ( (*p) > 10 ) {
 		if ( 11 <= (*p) )
  {			_widec = (short)(128 + ((*p) - -128));
 			if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 		}
 	} else {
 		_widec = (short)(128 + ((*p) - -128));
 		if (
-#line 831 "parser.rl"
+#line 815 "parser.rl"
  json->allow_trailing_comma  ) _widec += 256;
 	}
 	switch( _widec ) {
@@ -2276,7 +2205,7 @@ case 21:
 	_out: {}
 	}
 
-#line 854 "parser.rl"
+#line 838 "parser.rl"
 
     if(cs >= JSON_array_first_final) {
         long count = json->stack->head - stack_head;
@@ -2332,7 +2261,7 @@ static VALUE json_string_fastpath(JSON_Parser *json, char *string, char *stringE
 {
     size_t bufferSize = stringEnd - string;
 
-    if (is_name) {
+    if (is_name && json->in_array) {
         VALUE cached_key;
         if (RB_UNLIKELY(symbolize)) {
             cached_key = rsymbol_cache_fetch(&json->name_cache, string, bufferSize);
@@ -2355,7 +2284,7 @@ static VALUE json_string_unescape(JSON_Parser *json, char *string, char *stringE
     int unescape_len;
     char buf[4];
 
-    if (is_name) {
+    if (is_name && json->in_array) {
         VALUE cached_key;
         if (RB_UNLIKELY(symbolize)) {
             cached_key = rsymbol_cache_fetch(&json->name_cache, string, bufferSize);
@@ -2470,7 +2399,7 @@ static VALUE json_string_unescape(JSON_Parser *json, char *string, char *stringE
 }
 
 
-#line 2474 "parser.c"
+#line 2403 "parser.c"
 enum {JSON_string_start = 1};
 enum {JSON_string_first_final = 9};
 enum {JSON_string_error = 0};
@@ -2478,7 +2407,7 @@ enum {JSON_string_error = 0};
 enum {JSON_string_en_main = 1};
 
 
-#line 1077 "parser.rl"
+#line 1061 "parser.rl"
 
 
 static int
@@ -2499,15 +2428,15 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
     VALUE match_string;
 
 
-#line 2503 "parser.c"
+#line 2432 "parser.c"
 	{
 	cs = JSON_string_start;
 	}
 
-#line 1097 "parser.rl"
+#line 1081 "parser.rl"
     json->memo = p;
 
-#line 2511 "parser.c"
+#line 2440 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -2532,14 +2461,14 @@ case 2:
 		goto st0;
 	goto st2;
 tr2:
-#line 1059 "parser.rl"
+#line 1043 "parser.rl"
 	{
         *result = json_string_fastpath(json, json->memo + 1, p, json->parsing_name, json->parsing_name || json-> freeze, json->parsing_name && json->symbolize_names);
         {p = (( p + 1))-1;}
         p--;
         {p++; cs = 9; goto _out;}
     }
-#line 1052 "parser.rl"
+#line 1036 "parser.rl"
 	{
         *result = json_string_unescape(json, json->memo + 1, p, json->parsing_name, json->parsing_name || json-> freeze, json->parsing_name && json->symbolize_names);
         {p = (( p + 1))-1;}
@@ -2548,7 +2477,7 @@ tr2:
     }
 	goto st9;
 tr6:
-#line 1052 "parser.rl"
+#line 1036 "parser.rl"
 	{
         *result = json_string_unescape(json, json->memo + 1, p, json->parsing_name, json->parsing_name || json-> freeze, json->parsing_name && json->symbolize_names);
         {p = (( p + 1))-1;}
@@ -2560,7 +2489,7 @@ st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 2564 "parser.c"
+#line 2493 "parser.c"
 	goto st0;
 st3:
 	if ( ++p == pe )
@@ -2648,7 +2577,7 @@ case 8:
 	_out: {}
 	}
 
-#line 1099 "parser.rl"
+#line 1083 "parser.rl"
 
     if (json->create_additions && RTEST(match_string = json->match_string)) {
           VALUE klass;
@@ -2801,7 +2730,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 
-#line 2805 "parser.c"
+#line 2734 "parser.c"
 enum {JSON_start = 1};
 enum {JSON_first_final = 10};
 enum {JSON_error = 0};
@@ -2809,7 +2738,7 @@ enum {JSON_error = 0};
 enum {JSON_en_main = 1};
 
 
-#line 1265 "parser.rl"
+#line 1249 "parser.rl"
 
 
 /*
@@ -2838,16 +2767,16 @@ static VALUE cParser_parse(VALUE self)
     json->stack = &stack;
 
 
-#line 2842 "parser.c"
+#line 2771 "parser.c"
 	{
 	cs = JSON_start;
 	}
 
-#line 1293 "parser.rl"
+#line 1277 "parser.rl"
     p = json->source;
     pe = p + json->len;
 
-#line 2851 "parser.c"
+#line 2780 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -2881,7 +2810,7 @@ st0:
 cs = 0;
 	goto _out;
 tr2:
-#line 1257 "parser.rl"
+#line 1241 "parser.rl"
 	{
         char *np = JSON_parse_value(json, p, pe, &result, 0);
         if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
@@ -2891,7 +2820,7 @@ st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 2895 "parser.c"
+#line 2824 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -2980,7 +2909,7 @@ case 9:
 	_out: {}
 	}
 
-#line 1296 "parser.rl"
+#line 1280 "parser.rl"
 
     if (json->stack_handle) {
         rvalue_stack_eagerly_release(json->stack_handle);
@@ -3016,16 +2945,16 @@ static VALUE cParser_m_parse(VALUE klass, VALUE source, VALUE opts)
     json->stack = &stack;
 
 
-#line 3020 "parser.c"
+#line 2949 "parser.c"
 	{
 	cs = JSON_start;
 	}
 
-#line 1331 "parser.rl"
+#line 1315 "parser.rl"
     p = json->source;
     pe = p + json->len;
 
-#line 3029 "parser.c"
+#line 2958 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -3059,7 +2988,7 @@ st0:
 cs = 0;
 	goto _out;
 tr2:
-#line 1257 "parser.rl"
+#line 1241 "parser.rl"
 	{
         char *np = JSON_parse_value(json, p, pe, &result, 0);
         if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
@@ -3069,7 +2998,7 @@ st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 3073 "parser.c"
+#line 3002 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -3158,7 +3087,7 @@ case 9:
 	_out: {}
 	}
 
-#line 1334 "parser.rl"
+#line 1318 "parser.rl"
 
     if (json->stack_handle) {
         rvalue_stack_eagerly_release(json->stack_handle);
@@ -3183,8 +3112,10 @@ static void JSON_mark(void *ptr)
     rb_gc_mark(json->match_string);
     rb_gc_mark(json->stack_handle);
 
-    const VALUE *name_cache_entries = &json->name_cache.entries[0];
-    rb_gc_mark_locations(name_cache_entries, name_cache_entries + json->name_cache.length);
+    long index;
+    for (index = 0; index < json->name_cache.length; index++) {
+        rb_gc_mark(json->name_cache.entries[index]);
+    }
 }
 
 static void JSON_free(void *ptr)