json_pure 1.0.0 → 1.4.6

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

@@ -1,104 +1,164 @@
+
 #line 1 "parser.rl"
-/* vim: set cin et sw=4 ts=4: */
+#include "parser.h"
+
+/* unicode */
+
+static const char digit_values[256] = { 
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1,
+    -1, -1, -1, -1, -1, -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1
+};
+
+static UTF32 unescape_unicode(const unsigned char *p)
+{
+    char b;
+    UTF32 result = 0;
+    b = digit_values[p[0]];
+    if (b < 0) return UNI_REPLACEMENT_CHAR;
+    result = (result << 4) | b;
+    b = digit_values[p[1]];
+    result = (result << 4) | b;
+    if (b < 0) return UNI_REPLACEMENT_CHAR;
+    b = digit_values[p[2]];
+    result = (result << 4) | b;
+    if (b < 0) return UNI_REPLACEMENT_CHAR;
+    b = digit_values[p[3]];
+    result = (result << 4) | b;
+    if (b < 0) return UNI_REPLACEMENT_CHAR;
+    return result;
+}
 
-#include "ruby.h"
-#include "re.h"
-#include "unicode.h"
+static int convert_UTF32_to_UTF8(char *buf, UTF32 ch) 
+{
+    int len = 1;
+    if (ch <= 0x7F) {
+        buf[0] = (char) ch;
+    } else if (ch <= 0x07FF) {
+        buf[0] = (char) ((ch >> 6) | 0xC0);
+        buf[1] = (char) ((ch & 0x3F) | 0x80);
+        len++;
+    } else if (ch <= 0xFFFF) {
+        buf[0] = (char) ((ch >> 12) | 0xE0);
+        buf[1] = (char) (((ch >> 6) & 0x3F) | 0x80);
+        buf[2] = (char) ((ch & 0x3F) | 0x80);
+        len += 2;
+    } else if (ch <= 0x1fffff) {
+        buf[0] =(char) ((ch >> 18) | 0xF0);
+        buf[1] =(char) (((ch >> 12) & 0x3F) | 0x80);
+        buf[2] =(char) (((ch >> 6) & 0x3F) | 0x80);
+        buf[3] =(char) ((ch & 0x3F) | 0x80);
+        len += 3;
+    } else {
+        buf[0] = '?';
+    }
+    return len;
+}
 
-#ifndef swap16
-#define swap16(x)	((((x)&0xFF)<<8) | (((x)>>8)&0xFF))
+#ifdef HAVE_RUBY_ENCODING_H
+static VALUE CEncoding_ASCII_8BIT, CEncoding_UTF_8, CEncoding_UTF_16BE,
+    CEncoding_UTF_16LE, CEncoding_UTF_32BE, CEncoding_UTF_32LE;
+static ID i_encoding, i_encode, i_encode_bang, i_force_encoding;
+#else
+static ID i_iconv;
 #endif
 
-#define EVIL 0x666
+static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
+static VALUE CNaN, CInfinity, CMinusInfinity;
 
-static VALUE mJSON, mExt, cParser, eParserError;
+static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
+          i_chr, i_max_nesting, i_allow_nan, i_symbolize_names, i_object_class,
+          i_array_class, i_key_p, i_deep_const_get;
 
-static ID i_json_creatable_p, i_json_create, i_create_id, i_chr; 
 
-typedef struct JSON_ParserStruct {
-    VALUE Vsource;
-    char *source;
-    long len;
-    char *memo;
-    VALUE create_id;
-} JSON_Parser;
+#line 108 "parser.rl"
 
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result);
-static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result);
-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);
 
-#define GET_STRUCT                          \
-    JSON_Parser *json;                      \
-    Data_Get_Struct(self, JSON_Parser, json);
-
-#line 59 "parser.rl"
-
-
-
-#line 42 "parser.c"
-static const int JSON_object_start = 0;
 
+#line 90 "parser.c"
+static const int JSON_object_start = 1;
 static const int JSON_object_first_final = 27;
+static const int JSON_object_error = 0;
 
-static const int JSON_object_error = 1;
+static const int JSON_object_en_main = 1;
 
-#line 92 "parser.rl"
+
+#line 143 "parser.rl"
 
 
 static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
     VALUE last_name = Qnil;
-    *result = rb_hash_new();
+    VALUE object_class = json->object_class;
+
+    if (json->max_nesting && json->current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
+    }
+
+    *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
 
     
-#line 59 "parser.c"
+#line 114 "parser.c"
 	{
 	cs = JSON_object_start;
 	}
-#line 101 "parser.rl"
+
+#line 158 "parser.rl"
     
-#line 65 "parser.c"
+#line 121 "parser.c"
 	{
 	if ( p == pe )
-		goto _out;
+		goto _test_eof;
 	switch ( cs )
 	{
-case 0:
+case 1:
 	if ( (*p) == 123 )
 		goto st2;
-	goto st1;
-st1:
-	goto _out1;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
 st2:
 	if ( ++p == pe )
-		goto _out2;
+		goto _test_eof2;
 case 2:
 	switch( (*p) ) {
 		case 13: goto st2;
 		case 32: goto st2;
-		case 34: goto tr13;
+		case 34: goto tr2;
 		case 47: goto st23;
-		case 125: goto tr10;
+		case 125: goto tr4;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
 		goto st2;
-	goto st1;
-tr13:
-#line 78 "parser.rl"
+	goto st0;
+tr2:
+#line 127 "parser.rl"
 	{
-        char *np = JSON_parse_string(json, p, pe, &last_name);
-        if (np == NULL) goto _out3; else {p = (( np))-1;}
+        char *np;
+        json->parsing_name = 1;
+        np = JSON_parse_string(json, p, pe, &last_name);
+        json->parsing_name = 0;
+        if (np == NULL) { p--; {p++; cs = 3; goto _out;} } else {p = (( np))-1;}
     }
 	goto st3;
 st3:
 	if ( ++p == pe )
-		goto _out3;
+		goto _test_eof3;
 case 3:
-#line 102 "parser.c"
+#line 161 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -107,26 +167,26 @@ case 3:
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
 		goto st3;
-	goto st1;
+	goto st0;
 st4:
 	if ( ++p == pe )
-		goto _out4;
+		goto _test_eof4;
 case 4:
 	switch( (*p) ) {
 		case 42: goto st5;
 		case 47: goto st7;
 	}
-	goto st1;
+	goto st0;
 st5:
 	if ( ++p == pe )
-		goto _out5;
+		goto _test_eof5;
 case 5:
 	if ( (*p) == 42 )
 		goto st6;
 	goto st5;
 st6:
 	if ( ++p == pe )
-		goto _out6;
+		goto _test_eof6;
 case 6:
 	switch( (*p) ) {
 		case 42: goto st6;
@@ -135,14 +195,14 @@ case 6:
 	goto st5;
 st7:
 	if ( ++p == pe )
-		goto _out7;
+		goto _test_eof7;
 case 7:
 	if ( (*p) == 10 )
 		goto st3;
 	goto st7;
 st8:
 	if ( ++p == pe )
-		goto _out8;
+		goto _test_eof8;
 case 8:
 	switch( (*p) ) {
 		case 13: goto st8;
@@ -150,6 +210,8 @@ case 8:
 		case 34: goto tr11;
 		case 45: goto tr11;
 		case 47: goto st19;
+		case 73: goto tr11;
+		case 78: goto tr11;
 		case 91: goto tr11;
 		case 102: goto tr11;
 		case 110: goto tr11;
@@ -161,14 +223,14 @@ case 8:
 			goto tr11;
 	} else if ( (*p) >= 9 )
 		goto st8;
-	goto st1;
+	goto st0;
 tr11:
-#line 67 "parser.rl"
+#line 116 "parser.rl"
 	{
         VALUE v = Qnil;
         char *np = JSON_parse_value(json, p, pe, &v); 
         if (np == NULL) {
-            goto _out9;
+            p--; {p++; cs = 9; goto _out;}
         } else {
             rb_hash_aset(*result, last_name, v);
             {p = (( np))-1;}
@@ -177,51 +239,51 @@ tr11:
 	goto st9;
 st9:
 	if ( ++p == pe )
-		goto _out9;
+		goto _test_eof9;
 case 9:
-#line 183 "parser.c"
+#line 244 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st9;
 		case 32: goto st9;
 		case 44: goto st10;
 		case 47: goto st15;
-		case 125: goto tr10;
+		case 125: goto tr4;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
 		goto st9;
-	goto st1;
+	goto st0;
 st10:
 	if ( ++p == pe )
-		goto _out10;
+		goto _test_eof10;
 case 10:
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
-		case 34: goto tr13;
+		case 34: goto tr2;
 		case 47: goto st11;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
 		goto st10;
-	goto st1;
+	goto st0;
 st11:
 	if ( ++p == pe )
-		goto _out11;
+		goto _test_eof11;
 case 11:
 	switch( (*p) ) {
 		case 42: goto st12;
 		case 47: goto st14;
 	}
-	goto st1;
+	goto st0;
 st12:
 	if ( ++p == pe )
-		goto _out12;
+		goto _test_eof12;
 case 12:
 	if ( (*p) == 42 )
 		goto st13;
 	goto st12;
 st13:
 	if ( ++p == pe )
-		goto _out13;
+		goto _test_eof13;
 case 13:
 	switch( (*p) ) {
 		case 42: goto st13;
@@ -230,30 +292,30 @@ case 13:
 	goto st12;
 st14:
 	if ( ++p == pe )
-		goto _out14;
+		goto _test_eof14;
 case 14:
 	if ( (*p) == 10 )
 		goto st10;
 	goto st14;
 st15:
 	if ( ++p == pe )
-		goto _out15;
+		goto _test_eof15;
 case 15:
 	switch( (*p) ) {
 		case 42: goto st16;
 		case 47: goto st18;
 	}
-	goto st1;
+	goto st0;
 st16:
 	if ( ++p == pe )
-		goto _out16;
+		goto _test_eof16;
 case 16:
 	if ( (*p) == 42 )
 		goto st17;
 	goto st16;
 st17:
 	if ( ++p == pe )
-		goto _out17;
+		goto _test_eof17;
 case 17:
 	switch( (*p) ) {
 		case 42: goto st17;
@@ -262,40 +324,40 @@ case 17:
 	goto st16;
 st18:
 	if ( ++p == pe )
-		goto _out18;
+		goto _test_eof18;
 case 18:
 	if ( (*p) == 10 )
 		goto st9;
 	goto st18;
-tr10:
-#line 83 "parser.rl"
-	{ goto _out27; }
+tr4:
+#line 134 "parser.rl"
+	{ p--; {p++; cs = 27; goto _out;} }
 	goto st27;
 st27:
 	if ( ++p == pe )
-		goto _out27;
+		goto _test_eof27;
 case 27:
-#line 279 "parser.c"
-	goto st1;
+#line 340 "parser.c"
+	goto st0;
 st19:
 	if ( ++p == pe )
-		goto _out19;
+		goto _test_eof19;
 case 19:
 	switch( (*p) ) {
 		case 42: goto st20;
 		case 47: goto st22;
 	}
-	goto st1;
+	goto st0;
 st20:
 	if ( ++p == pe )
-		goto _out20;
+		goto _test_eof20;
 case 20:
 	if ( (*p) == 42 )
 		goto st21;
 	goto st20;
 st21:
 	if ( ++p == pe )
-		goto _out21;
+		goto _test_eof21;
 case 21:
 	switch( (*p) ) {
 		case 42: goto st21;
@@ -304,30 +366,30 @@ case 21:
 	goto st20;
 st22:
 	if ( ++p == pe )
-		goto _out22;
+		goto _test_eof22;
 case 22:
 	if ( (*p) == 10 )
 		goto st8;
 	goto st22;
 st23:
 	if ( ++p == pe )
-		goto _out23;
+		goto _test_eof23;
 case 23:
 	switch( (*p) ) {
 		case 42: goto st24;
 		case 47: goto st26;
 	}
-	goto st1;
+	goto st0;
 st24:
 	if ( ++p == pe )
-		goto _out24;
+		goto _test_eof24;
 case 24:
 	if ( (*p) == 42 )
 		goto st25;
 	goto st24;
 st25:
 	if ( ++p == pe )
-		goto _out25;
+		goto _test_eof25;
 case 25:
 	switch( (*p) ) {
 		case 42: goto st25;
@@ -336,50 +398,53 @@ case 25:
 	goto st24;
 st26:
 	if ( ++p == pe )
-		goto _out26;
+		goto _test_eof26;
 case 26:
 	if ( (*p) == 10 )
 		goto st2;
 	goto st26;
 	}
-	_out1: cs = 1; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out4: cs = 4; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out6: cs = 6; goto _out; 
-	_out7: cs = 7; goto _out; 
-	_out8: cs = 8; goto _out; 
-	_out9: cs = 9; goto _out; 
-	_out10: cs = 10; goto _out; 
-	_out11: cs = 11; goto _out; 
-	_out12: cs = 12; goto _out; 
-	_out13: cs = 13; goto _out; 
-	_out14: cs = 14; goto _out; 
-	_out15: cs = 15; goto _out; 
-	_out16: cs = 16; goto _out; 
-	_out17: cs = 17; goto _out; 
-	_out18: cs = 18; goto _out; 
-	_out27: cs = 27; goto _out; 
-	_out19: cs = 19; goto _out; 
-	_out20: cs = 20; goto _out; 
-	_out21: cs = 21; goto _out; 
-	_out22: cs = 22; goto _out; 
-	_out23: cs = 23; goto _out; 
-	_out24: cs = 24; goto _out; 
-	_out25: cs = 25; goto _out; 
-	_out26: cs = 26; goto _out; 
-
+	_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_eof6: cs = 6; goto _test_eof; 
+	_test_eof7: cs = 7; goto _test_eof; 
+	_test_eof8: cs = 8; goto _test_eof; 
+	_test_eof9: cs = 9; goto _test_eof; 
+	_test_eof10: cs = 10; goto _test_eof; 
+	_test_eof11: cs = 11; goto _test_eof; 
+	_test_eof12: cs = 12; goto _test_eof; 
+	_test_eof13: cs = 13; goto _test_eof; 
+	_test_eof14: cs = 14; goto _test_eof; 
+	_test_eof15: cs = 15; goto _test_eof; 
+	_test_eof16: cs = 16; goto _test_eof; 
+	_test_eof17: cs = 17; goto _test_eof; 
+	_test_eof18: cs = 18; goto _test_eof; 
+	_test_eof27: cs = 27; goto _test_eof; 
+	_test_eof19: cs = 19; goto _test_eof; 
+	_test_eof20: cs = 20; goto _test_eof; 
+	_test_eof21: cs = 21; goto _test_eof; 
+	_test_eof22: cs = 22; goto _test_eof; 
+	_test_eof23: cs = 23; goto _test_eof; 
+	_test_eof24: cs = 24; goto _test_eof; 
+	_test_eof25: cs = 25; goto _test_eof; 
+	_test_eof26: cs = 26; goto _test_eof; 
+
+	_test_eof: {}
 	_out: {}
 	}
-#line 102 "parser.rl"
+
+#line 159 "parser.rl"
 
     if (cs >= JSON_object_first_final) {
-        VALUE klassname = rb_hash_aref(*result, json->create_id);
-        if (!NIL_P(klassname)) {
-            VALUE klass = rb_path2class(StringValueCStr(klassname));
-            if RTEST(rb_funcall(klass, i_json_creatable_p, 0)) {
-                *result = rb_funcall(klass, i_json_create, 1, *result);
+        if (RTEST(json->create_id)) {
+            VALUE klassname = rb_hash_aref(*result, json->create_id);
+            if (!NIL_P(klassname)) {
+                VALUE klass = rb_funcall(mJSON, i_deep_const_get, 1, klassname);
+                if RTEST(rb_funcall(klass, i_json_creatable_p, 0)) {
+                    *result = rb_funcall(klass, i_json_create, 1, *result);
+                }
             }
         }
         return p + 1;
@@ -389,14 +454,15 @@ case 26:
 }
 
 
-#line 393 "parser.c"
-static const int JSON_value_start = 0;
+#line 457 "parser.c"
+static const int JSON_value_start = 1;
+static const int JSON_value_first_final = 21;
+static const int JSON_value_error = 0;
 
-static const int JSON_value_first_final = 12;
+static const int JSON_value_en_main = 1;
 
-static const int JSON_value_error = 1;
 
-#line 167 "parser.rl"
+#line 257 "parser.rl"
 
 
 static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -404,178 +470,290 @@ static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *resul
     int cs = EVIL;
 
     
-#line 408 "parser.c"
+#line 473 "parser.c"
 	{
 	cs = JSON_value_start;
 	}
-#line 174 "parser.rl"
+
+#line 264 "parser.rl"
     
-#line 414 "parser.c"
+#line 480 "parser.c"
 	{
 	if ( p == pe )
-		goto _out;
+		goto _test_eof;
 	switch ( cs )
 	{
-case 0:
+case 1:
 	switch( (*p) ) {
-		case 34: goto tr9;
-		case 45: goto tr10;
-		case 91: goto tr11;
-		case 102: goto st2;
-		case 110: goto st6;
-		case 116: goto st9;
-		case 123: goto tr15;
+		case 34: goto tr0;
+		case 45: goto tr2;
+		case 73: goto st2;
+		case 78: goto st9;
+		case 91: goto tr5;
+		case 102: goto st11;
+		case 110: goto st15;
+		case 116: goto st18;
+		case 123: goto tr9;
 	}
 	if ( 48 <= (*p) && (*p) <= 57 )
-		goto tr10;
-	goto st1;
-st1:
-	goto _out1;
-tr5:
-#line 123 "parser.rl"
-	{
-        *result = Qnil;
-    }
-	goto st12;
-tr6:
-#line 126 "parser.rl"
-	{
-        *result = Qfalse;
-    }
-	goto st12;
-tr7:
-#line 129 "parser.rl"
-	{
-        *result = Qtrue;
-    }
-	goto st12;
-tr9:
-#line 132 "parser.rl"
+		goto tr2;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
+tr0:
+#line 205 "parser.rl"
 	{
         char *np = JSON_parse_string(json, p, pe, result);
-        if (np == NULL) goto _out12; else {p = (( np))-1;}
+        if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
     }
-	goto st12;
-tr10:
-#line 137 "parser.rl"
+	goto st21;
+tr2:
+#line 210 "parser.rl"
 	{
         char *np;
+        if(pe > p + 9 && !strncmp(MinusInfinity, p, 9)) {
+            if (json->allow_nan) {
+                *result = CMinusInfinity;
+                {p = (( p + 10))-1;}
+                p--; {p++; cs = 21; goto _out;}
+            } else {
+                rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+            }
+        }
         np = JSON_parse_float(json, p, pe, result);
         if (np != NULL) {p = (( np))-1;}
         np = JSON_parse_integer(json, p, pe, result);
         if (np != NULL) {p = (( np))-1;}
-        goto _out12;
+        p--; {p++; cs = 21; goto _out;}
     }
-	goto st12;
-tr11:
-#line 146 "parser.rl"
+	goto st21;
+tr5:
+#line 228 "parser.rl"
 	{ 
-        char *np = JSON_parse_array(json, p, pe, result);
-        if (np == NULL) goto _out12; else {p = (( np))-1;}
+        char *np;
+        json->current_nesting++;
+        np = JSON_parse_array(json, p, pe, result);
+        json->current_nesting--;
+        if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
     }
-	goto st12;
-tr15:
-#line 151 "parser.rl"
+	goto st21;
+tr9:
+#line 236 "parser.rl"
 	{ 
-        char *np =  JSON_parse_object(json, p, pe, result);
-        if (np == NULL) goto _out12; else {p = (( np))-1;}
+        char *np;
+        json->current_nesting++;
+        np =  JSON_parse_object(json, p, pe, result);
+        json->current_nesting--;
+        if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
     }
-	goto st12;
-st12:
+	goto st21;
+tr16:
+#line 198 "parser.rl"
+	{
+        if (json->allow_nan) {
+            *result = CInfinity;
+        } else {
+            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
+        }
+    }
+	goto st21;
+tr18:
+#line 191 "parser.rl"
+	{
+        if (json->allow_nan) {
+            *result = CNaN;
+        } else {
+            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
+        }
+    }
+	goto st21;
+tr22:
+#line 185 "parser.rl"
+	{
+        *result = Qfalse;
+    }
+	goto st21;
+tr25:
+#line 182 "parser.rl"
+	{
+        *result = Qnil;
+    }
+	goto st21;
+tr28:
+#line 188 "parser.rl"
+	{
+        *result = Qtrue;
+    }
+	goto st21;
+st21:
 	if ( ++p == pe )
-		goto _out12;
-case 12:
-#line 156 "parser.rl"
-	{ goto _out12; }
-#line 491 "parser.c"
-	goto st1;
+		goto _test_eof21;
+case 21:
+#line 244 "parser.rl"
+	{ p--; {p++; cs = 21; goto _out;} }
+#line 595 "parser.c"
+	goto st0;
 st2:
 	if ( ++p == pe )
-		goto _out2;
+		goto _test_eof2;
 case 2:
-	if ( (*p) == 97 )
+	if ( (*p) == 110 )
 		goto st3;
-	goto st1;
+	goto st0;
 st3:
 	if ( ++p == pe )
-		goto _out3;
+		goto _test_eof3;
 case 3:
-	if ( (*p) == 108 )
+	if ( (*p) == 102 )
 		goto st4;
-	goto st1;
+	goto st0;
 st4:
 	if ( ++p == pe )
-		goto _out4;
+		goto _test_eof4;
 case 4:
-	if ( (*p) == 115 )
+	if ( (*p) == 105 )
 		goto st5;
-	goto st1;
+	goto st0;
 st5:
 	if ( ++p == pe )
-		goto _out5;
+		goto _test_eof5;
 case 5:
-	if ( (*p) == 101 )
-		goto tr6;
-	goto st1;
+	if ( (*p) == 110 )
+		goto st6;
+	goto st0;
 st6:
 	if ( ++p == pe )
-		goto _out6;
+		goto _test_eof6;
 case 6:
-	if ( (*p) == 117 )
+	if ( (*p) == 105 )
 		goto st7;
-	goto st1;
+	goto st0;
 st7:
 	if ( ++p == pe )
-		goto _out7;
+		goto _test_eof7;
 case 7:
-	if ( (*p) == 108 )
+	if ( (*p) == 116 )
 		goto st8;
-	goto st1;
+	goto st0;
 st8:
 	if ( ++p == pe )
-		goto _out8;
+		goto _test_eof8;
 case 8:
-	if ( (*p) == 108 )
-		goto tr5;
-	goto st1;
+	if ( (*p) == 121 )
+		goto tr16;
+	goto st0;
 st9:
 	if ( ++p == pe )
-		goto _out9;
+		goto _test_eof9;
 case 9:
-	if ( (*p) == 114 )
+	if ( (*p) == 97 )
 		goto st10;
-	goto st1;
+	goto st0;
 st10:
 	if ( ++p == pe )
-		goto _out10;
+		goto _test_eof10;
 case 10:
-	if ( (*p) == 117 )
-		goto st11;
-	goto st1;
+	if ( (*p) == 78 )
+		goto tr18;
+	goto st0;
 st11:
 	if ( ++p == pe )
-		goto _out11;
+		goto _test_eof11;
 case 11:
+	if ( (*p) == 97 )
+		goto st12;
+	goto st0;
+st12:
+	if ( ++p == pe )
+		goto _test_eof12;
+case 12:
+	if ( (*p) == 108 )
+		goto st13;
+	goto st0;
+st13:
+	if ( ++p == pe )
+		goto _test_eof13;
+case 13:
+	if ( (*p) == 115 )
+		goto st14;
+	goto st0;
+st14:
+	if ( ++p == pe )
+		goto _test_eof14;
+case 14:
+	if ( (*p) == 101 )
+		goto tr22;
+	goto st0;
+st15:
+	if ( ++p == pe )
+		goto _test_eof15;
+case 15:
+	if ( (*p) == 117 )
+		goto st16;
+	goto st0;
+st16:
+	if ( ++p == pe )
+		goto _test_eof16;
+case 16:
+	if ( (*p) == 108 )
+		goto st17;
+	goto st0;
+st17:
+	if ( ++p == pe )
+		goto _test_eof17;
+case 17:
+	if ( (*p) == 108 )
+		goto tr25;
+	goto st0;
+st18:
+	if ( ++p == pe )
+		goto _test_eof18;
+case 18:
+	if ( (*p) == 114 )
+		goto st19;
+	goto st0;
+st19:
+	if ( ++p == pe )
+		goto _test_eof19;
+case 19:
+	if ( (*p) == 117 )
+		goto st20;
+	goto st0;
+st20:
+	if ( ++p == pe )
+		goto _test_eof20;
+case 20:
 	if ( (*p) == 101 )
-		goto tr7;
-	goto st1;
+		goto tr28;
+	goto st0;
 	}
-	_out1: cs = 1; goto _out; 
-	_out12: cs = 12; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out4: cs = 4; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out6: cs = 6; goto _out; 
-	_out7: cs = 7; goto _out; 
-	_out8: cs = 8; goto _out; 
-	_out9: cs = 9; goto _out; 
-	_out10: cs = 10; goto _out; 
-	_out11: cs = 11; goto _out; 
-
+	_test_eof21: cs = 21; goto _test_eof; 
+	_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_eof6: cs = 6; goto _test_eof; 
+	_test_eof7: cs = 7; goto _test_eof; 
+	_test_eof8: cs = 8; goto _test_eof; 
+	_test_eof9: cs = 9; goto _test_eof; 
+	_test_eof10: cs = 10; goto _test_eof; 
+	_test_eof11: cs = 11; goto _test_eof; 
+	_test_eof12: cs = 12; goto _test_eof; 
+	_test_eof13: cs = 13; goto _test_eof; 
+	_test_eof14: cs = 14; goto _test_eof; 
+	_test_eof15: cs = 15; goto _test_eof; 
+	_test_eof16: cs = 16; goto _test_eof; 
+	_test_eof17: cs = 17; goto _test_eof; 
+	_test_eof18: cs = 18; goto _test_eof; 
+	_test_eof19: cs = 19; goto _test_eof; 
+	_test_eof20: cs = 20; goto _test_eof; 
+
+	_test_eof: {}
 	_out: {}
 	}
-#line 175 "parser.rl"
+
+#line 265 "parser.rl"
 
     if (cs >= JSON_value_first_final) {
         return p;
@@ -585,14 +763,15 @@ case 11:
 }
 
 
-#line 589 "parser.c"
-static const int JSON_integer_start = 0;
-
+#line 766 "parser.c"
+static const int JSON_integer_start = 1;
 static const int JSON_integer_first_final = 5;
+static const int JSON_integer_error = 0;
 
-static const int JSON_integer_error = 1;
+static const int JSON_integer_en_main = 1;
 
-#line 191 "parser.rl"
+
+#line 281 "parser.rl"
 
 
 static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -600,72 +779,75 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
     int cs = EVIL;
 
     
-#line 604 "parser.c"
+#line 782 "parser.c"
 	{
 	cs = JSON_integer_start;
 	}
-#line 198 "parser.rl"
+
+#line 288 "parser.rl"
     json->memo = p;
     
-#line 611 "parser.c"
+#line 790 "parser.c"
 	{
 	if ( p == pe )
-		goto _out;
+		goto _test_eof;
 	switch ( cs )
 	{
-case 0:
+case 1:
 	switch( (*p) ) {
 		case 45: goto st2;
 		case 48: goto st3;
 	}
 	if ( 49 <= (*p) && (*p) <= 57 )
 		goto st4;
-	goto st1;
-st1:
-	goto _out1;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
 st2:
 	if ( ++p == pe )
-		goto _out2;
+		goto _test_eof2;
 case 2:
 	if ( (*p) == 48 )
 		goto st3;
 	if ( 49 <= (*p) && (*p) <= 57 )
 		goto st4;
-	goto st1;
+	goto st0;
 st3:
 	if ( ++p == pe )
-		goto _out3;
+		goto _test_eof3;
 case 3:
 	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st1;
+		goto st0;
 	goto tr4;
 tr4:
-#line 188 "parser.rl"
-	{ goto _out5; }
+#line 278 "parser.rl"
+	{ p--; {p++; cs = 5; goto _out;} }
 	goto st5;
 st5:
 	if ( ++p == pe )
-		goto _out5;
+		goto _test_eof5;
 case 5:
-#line 651 "parser.c"
-	goto st1;
+#line 831 "parser.c"
+	goto st0;
 st4:
 	if ( ++p == pe )
-		goto _out4;
+		goto _test_eof4;
 case 4:
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st4;
 	goto tr4;
 	}
-	_out1: cs = 1; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out4: cs = 4; goto _out; 
+	_test_eof2: cs = 2; goto _test_eof; 
+	_test_eof3: cs = 3; goto _test_eof; 
+	_test_eof5: cs = 5; goto _test_eof; 
+	_test_eof4: cs = 4; goto _test_eof; 
 
+	_test_eof: {}
 	_out: {}
 	}
-#line 200 "parser.rl"
+
+#line 290 "parser.rl"
 
     if (cs >= JSON_integer_first_final) {
         long len = p - json->memo;
@@ -677,14 +859,15 @@ case 4:
 }
 
 
-#line 681 "parser.c"
-static const int JSON_float_start = 0;
-
+#line 862 "parser.c"
+static const int JSON_float_start = 1;
 static const int JSON_float_first_final = 10;
+static const int JSON_float_error = 0;
 
-static const int JSON_float_error = 1;
+static const int JSON_float_en_main = 1;
 
-#line 222 "parser.rl"
+
+#line 312 "parser.rl"
 
 
 static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -692,55 +875,60 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
     int cs = EVIL;
 
     
-#line 696 "parser.c"
+#line 878 "parser.c"
 	{
 	cs = JSON_float_start;
 	}
-#line 229 "parser.rl"
+
+#line 319 "parser.rl"
     json->memo = p;
     
-#line 703 "parser.c"
+#line 886 "parser.c"
 	{
 	if ( p == pe )
-		goto _out;
+		goto _test_eof;
 	switch ( cs )
 	{
-case 0:
+case 1:
 	switch( (*p) ) {
 		case 45: goto st2;
 		case 48: goto st3;
 	}
 	if ( 49 <= (*p) && (*p) <= 57 )
 		goto st9;
-	goto st1;
-st1:
-	goto _out1;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
 st2:
 	if ( ++p == pe )
-		goto _out2;
+		goto _test_eof2;
 case 2:
 	if ( (*p) == 48 )
 		goto st3;
 	if ( 49 <= (*p) && (*p) <= 57 )
 		goto st9;
-	goto st1;
+	goto st0;
 st3:
 	if ( ++p == pe )
-		goto _out3;
+		goto _test_eof3;
 case 3:
-	if ( (*p) == 46 )
-		goto st4;
-	goto st1;
+	switch( (*p) ) {
+		case 46: goto st4;
+		case 69: goto st6;
+		case 101: goto st6;
+	}
+	goto st0;
 st4:
 	if ( ++p == pe )
-		goto _out4;
+		goto _test_eof4;
 case 4:
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st5;
-	goto st1;
+	goto st0;
 st5:
 	if ( ++p == pe )
-		goto _out5;
+		goto _test_eof5;
 case 5:
 	switch( (*p) ) {
 		case 69: goto st6;
@@ -750,21 +938,21 @@ case 5:
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st5;
 	} else if ( (*p) >= 45 )
-		goto st1;
-	goto tr8;
-tr8:
-#line 216 "parser.rl"
-	{ goto _out10; }
+		goto st0;
+	goto tr7;
+tr7:
+#line 306 "parser.rl"
+	{ p--; {p++; cs = 10; goto _out;} }
 	goto st10;
 st10:
 	if ( ++p == pe )
-		goto _out10;
+		goto _test_eof10;
 case 10:
-#line 764 "parser.c"
-	goto st1;
+#line 951 "parser.c"
+	goto st0;
 st6:
 	if ( ++p == pe )
-		goto _out6;
+		goto _test_eof6;
 case 6:
 	switch( (*p) ) {
 		case 43: goto st7;
@@ -772,31 +960,31 @@ case 6:
 	}
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st8;
-	goto st1;
+	goto st0;
 st7:
 	if ( ++p == pe )
-		goto _out7;
+		goto _test_eof7;
 case 7:
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st8;
-	goto st1;
+	goto st0;
 st8:
 	if ( ++p == pe )
-		goto _out8;
+		goto _test_eof8;
 case 8:
 	switch( (*p) ) {
-		case 69: goto st1;
-		case 101: goto st1;
+		case 69: goto st0;
+		case 101: goto st0;
 	}
 	if ( (*p) > 46 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st8;
 	} else if ( (*p) >= 45 )
-		goto st1;
-	goto tr8;
+		goto st0;
+	goto tr7;
 st9:
 	if ( ++p == pe )
-		goto _out9;
+		goto _test_eof9;
 case 9:
 	switch( (*p) ) {
 		case 46: goto st4;
@@ -805,22 +993,23 @@ case 9:
 	}
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st9;
-	goto st1;
+	goto st0;
 	}
-	_out1: cs = 1; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out4: cs = 4; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out10: cs = 10; goto _out; 
-	_out6: cs = 6; goto _out; 
-	_out7: cs = 7; goto _out; 
-	_out8: cs = 8; goto _out; 
-	_out9: cs = 9; goto _out; 
-
+	_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_eof10: cs = 10; goto _test_eof; 
+	_test_eof6: cs = 6; goto _test_eof; 
+	_test_eof7: cs = 7; goto _test_eof; 
+	_test_eof8: cs = 8; goto _test_eof; 
+	_test_eof9: cs = 9; goto _test_eof; 
+
+	_test_eof: {}
 	_out: {}
 	}
-#line 231 "parser.rl"
+
+#line 321 "parser.rl"
 
     if (cs >= JSON_float_first_final) {
         long len = p - json->memo;
@@ -833,70 +1022,80 @@ case 9:
 
 
 
-#line 837 "parser.c"
-static const int JSON_array_start = 0;
-
+#line 1025 "parser.c"
+static const int JSON_array_start = 1;
 static const int JSON_array_first_final = 17;
+static const int JSON_array_error = 0;
 
-static const int JSON_array_error = 1;
+static const int JSON_array_en_main = 1;
 
-#line 267 "parser.rl"
+
+#line 357 "parser.rl"
 
 
 static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
-    *result = rb_ary_new();
+    VALUE array_class = json->array_class;
+
+    if (json->max_nesting && json->current_nesting > json->max_nesting) {
+        rb_raise(eNestingError, "nesting of %d is too deep", json->current_nesting);
+    }
+    *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
 
     
-#line 853 "parser.c"
+#line 1047 "parser.c"
 	{
 	cs = JSON_array_start;
 	}
-#line 275 "parser.rl"
+
+#line 370 "parser.rl"
     
-#line 859 "parser.c"
+#line 1054 "parser.c"
 	{
 	if ( p == pe )
-		goto _out;
+		goto _test_eof;
 	switch ( cs )
 	{
-case 0:
+case 1:
 	if ( (*p) == 91 )
 		goto st2;
-	goto st1;
-st1:
-	goto _out1;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
 st2:
 	if ( ++p == pe )
-		goto _out2;
+		goto _test_eof2;
 case 2:
 	switch( (*p) ) {
 		case 13: goto st2;
 		case 32: goto st2;
-		case 34: goto tr8;
-		case 45: goto tr8;
+		case 34: goto tr2;
+		case 45: goto tr2;
 		case 47: goto st13;
-		case 91: goto tr8;
-		case 93: goto tr7;
-		case 102: goto tr8;
-		case 110: goto tr8;
-		case 116: goto tr8;
-		case 123: goto tr8;
+		case 73: goto tr2;
+		case 78: goto tr2;
+		case 91: goto tr2;
+		case 93: goto tr4;
+		case 102: goto tr2;
+		case 110: goto tr2;
+		case 116: goto tr2;
+		case 123: goto tr2;
 	}
 	if ( (*p) > 10 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr8;
+			goto tr2;
 	} else if ( (*p) >= 9 )
 		goto st2;
-	goto st1;
-tr8:
-#line 248 "parser.rl"
+	goto st0;
+tr2:
+#line 338 "parser.rl"
 	{
         VALUE v = Qnil;
         char *np = JSON_parse_value(json, p, pe, &v); 
         if (np == NULL) {
-            goto _out3;
+            p--; {p++; cs = 3; goto _out;}
         } else {
             rb_ary_push(*result, v);
             {p = (( np))-1;}
@@ -905,60 +1104,62 @@ tr8:
 	goto st3;
 st3:
 	if ( ++p == pe )
-		goto _out3;
+		goto _test_eof3;
 case 3:
-#line 911 "parser.c"
+#line 1109 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
 		case 44: goto st4;
 		case 47: goto st9;
-		case 93: goto tr7;
+		case 93: goto tr4;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
 		goto st3;
-	goto st1;
+	goto st0;
 st4:
 	if ( ++p == pe )
-		goto _out4;
+		goto _test_eof4;
 case 4:
 	switch( (*p) ) {
 		case 13: goto st4;
 		case 32: goto st4;
-		case 34: goto tr8;
-		case 45: goto tr8;
+		case 34: goto tr2;
+		case 45: goto tr2;
 		case 47: goto st5;
-		case 91: goto tr8;
-		case 102: goto tr8;
-		case 110: goto tr8;
-		case 116: goto tr8;
-		case 123: goto tr8;
+		case 73: goto tr2;
+		case 78: goto tr2;
+		case 91: goto tr2;
+		case 102: goto tr2;
+		case 110: goto tr2;
+		case 116: goto tr2;
+		case 123: goto tr2;
 	}
 	if ( (*p) > 10 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr8;
+			goto tr2;
 	} else if ( (*p) >= 9 )
 		goto st4;
-	goto st1;
+	goto st0;
 st5:
 	if ( ++p == pe )
-		goto _out5;
+		goto _test_eof5;
 case 5:
 	switch( (*p) ) {
 		case 42: goto st6;
 		case 47: goto st8;
 	}
-	goto st1;
+	goto st0;
 st6:
 	if ( ++p == pe )
-		goto _out6;
+		goto _test_eof6;
 case 6:
 	if ( (*p) == 42 )
 		goto st7;
 	goto st6;
 st7:
 	if ( ++p == pe )
-		goto _out7;
+		goto _test_eof7;
 case 7:
 	switch( (*p) ) {
 		case 42: goto st7;
@@ -967,30 +1168,30 @@ case 7:
 	goto st6;
 st8:
 	if ( ++p == pe )
-		goto _out8;
+		goto _test_eof8;
 case 8:
 	if ( (*p) == 10 )
 		goto st4;
 	goto st8;
 st9:
 	if ( ++p == pe )
-		goto _out9;
+		goto _test_eof9;
 case 9:
 	switch( (*p) ) {
 		case 42: goto st10;
 		case 47: goto st12;
 	}
-	goto st1;
+	goto st0;
 st10:
 	if ( ++p == pe )
-		goto _out10;
+		goto _test_eof10;
 case 10:
 	if ( (*p) == 42 )
 		goto st11;
 	goto st10;
 st11:
 	if ( ++p == pe )
-		goto _out11;
+		goto _test_eof11;
 case 11:
 	switch( (*p) ) {
 		case 42: goto st11;
@@ -999,40 +1200,40 @@ case 11:
 	goto st10;
 st12:
 	if ( ++p == pe )
-		goto _out12;
+		goto _test_eof12;
 case 12:
 	if ( (*p) == 10 )
 		goto st3;
 	goto st12;
-tr7:
-#line 259 "parser.rl"
-	{ goto _out17; }
+tr4:
+#line 349 "parser.rl"
+	{ p--; {p++; cs = 17; goto _out;} }
 	goto st17;
 st17:
 	if ( ++p == pe )
-		goto _out17;
+		goto _test_eof17;
 case 17:
-#line 1016 "parser.c"
-	goto st1;
+#line 1216 "parser.c"
+	goto st0;
 st13:
 	if ( ++p == pe )
-		goto _out13;
+		goto _test_eof13;
 case 13:
 	switch( (*p) ) {
 		case 42: goto st14;
 		case 47: goto st16;
 	}
-	goto st1;
+	goto st0;
 st14:
 	if ( ++p == pe )
-		goto _out14;
+		goto _test_eof14;
 case 14:
 	if ( (*p) == 42 )
 		goto st15;
 	goto st14;
 st15:
 	if ( ++p == pe )
-		goto _out15;
+		goto _test_eof15;
 case 15:
 	switch( (*p) ) {
 		case 42: goto st15;
@@ -1041,174 +1242,196 @@ case 15:
 	goto st14;
 st16:
 	if ( ++p == pe )
-		goto _out16;
+		goto _test_eof16;
 case 16:
 	if ( (*p) == 10 )
 		goto st2;
 	goto st16;
 	}
-	_out1: cs = 1; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out4: cs = 4; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out6: cs = 6; goto _out; 
-	_out7: cs = 7; goto _out; 
-	_out8: cs = 8; goto _out; 
-	_out9: cs = 9; goto _out; 
-	_out10: cs = 10; goto _out; 
-	_out11: cs = 11; goto _out; 
-	_out12: cs = 12; goto _out; 
-	_out17: cs = 17; goto _out; 
-	_out13: cs = 13; goto _out; 
-	_out14: cs = 14; goto _out; 
-	_out15: cs = 15; goto _out; 
-	_out16: cs = 16; goto _out; 
-
+	_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_eof6: cs = 6; goto _test_eof; 
+	_test_eof7: cs = 7; goto _test_eof; 
+	_test_eof8: cs = 8; goto _test_eof; 
+	_test_eof9: cs = 9; goto _test_eof; 
+	_test_eof10: cs = 10; goto _test_eof; 
+	_test_eof11: cs = 11; goto _test_eof; 
+	_test_eof12: cs = 12; goto _test_eof; 
+	_test_eof17: cs = 17; goto _test_eof; 
+	_test_eof13: cs = 13; goto _test_eof; 
+	_test_eof14: cs = 14; goto _test_eof; 
+	_test_eof15: cs = 15; goto _test_eof; 
+	_test_eof16: cs = 16; goto _test_eof; 
+
+	_test_eof: {}
 	_out: {}
 	}
-#line 276 "parser.rl"
+
+#line 371 "parser.rl"
 
     if(cs >= JSON_array_first_final) {
         return p + 1;
     } else {
-        rb_raise(eParserError, "unexpected token at '%s'", p);
+        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        return NULL;
     }
 }
 
-static VALUE json_string_escape(char *p, char *pe)
+static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
 {
-    VALUE result = rb_str_buf_new(pe - p + 1);
-
-    while (p < pe) {
-        if (*p == '\\') {
-            p++;
-            if (p >= pe) return Qnil; /* raise an exception later, \ at end */
-            switch (*p) {
+    char *p = string, *pe = string, *unescape;
+    int unescape_len;
+
+    while (pe < stringEnd) {
+        if (*pe == '\\') {
+            unescape = (char *) "?";
+            unescape_len = 1;
+            if (pe > p) rb_str_buf_cat(result, p, pe - p);
+            switch (*++pe) {
+                case 'n':
+                    unescape = (char *) "\n";
+                    break;
+                case 'r':
+                    unescape = (char *) "\r";
+                    break;
+                case 't':
+                    unescape = (char *) "\t";
+                    break;
                 case '"':
+                    unescape = (char *) "\"";
+                    break;
                 case '\\':
-                    rb_str_buf_cat(result, p, 1);
-                    p++;
+                    unescape = (char *) "\\";
                     break;
                 case 'b':
-                    rb_str_buf_cat2(result, "\b");
-                    p++;
+                    unescape = (char *) "\b";
                     break;
                 case 'f':
-                    rb_str_buf_cat2(result, "\f");
-                    p++;
-                    break;
-                case 'n':
-                    rb_str_buf_cat2(result, "\n");
-                    p++;
-                    break;
-                case 'r':
-                    rb_str_buf_cat2(result, "\r");
-                    p++;
-                    break;
-                case 't':
-                    rb_str_buf_cat2(result, "\t");
-                    p++;
+                    unescape = (char *) "\f";
                     break;
                 case 'u':
-                    if (p > pe - 4) { 
+                    if (pe > stringEnd - 4) { 
                         return Qnil;
                     } else {
-                        p = JSON_convert_UTF16_to_UTF8(result, p, pe, strictConversion);
+                        char buf[4];
+                        UTF32 ch = unescape_unicode((unsigned char *) ++pe);
+                        pe += 3;
+                        if (UNI_SUR_HIGH_START == (ch & 0xFC00)) {
+                            pe++;
+                            if (pe > stringEnd - 6) return Qnil;
+                            if (pe[0] == '\\' && pe[1] == 'u') {
+                                UTF32 sur = unescape_unicode((unsigned char *) pe + 2);
+                                ch = (((ch & 0x3F) << 10) | ((((ch >> 6) & 0xF) + 1) << 16)
+                                        | (sur & 0x3FF));
+                                pe += 5;
+                            } else {
+                                unescape = (char *) "?";
+                                break;
+                            }
+                        }
+                        unescape_len = convert_UTF32_to_UTF8(buf, ch);
+                        unescape = buf;
                     }
                     break;
+                default:
+                    p = pe;
+                    continue;
             }
+            rb_str_buf_cat(result, unescape, unescape_len);
+            p = ++pe;
         } else {
-            char *q = p;
-            while (*q != '\\' && q < pe) q++;
-            rb_str_buf_cat(result, p, q - p);
-            p = q;
+            pe++;
         }
     }
+    rb_str_buf_cat(result, p, pe - p);
     return result;
 }
 
 
-#line 1133 "parser.c"
-static const int JSON_string_start = 0;
-
+#line 1353 "parser.c"
+static const int JSON_string_start = 1;
 static const int JSON_string_first_final = 8;
+static const int JSON_string_error = 0;
 
-static const int JSON_string_error = 1;
+static const int JSON_string_en_main = 1;
 
-#line 350 "parser.rl"
+
+#line 470 "parser.rl"
 
 
 static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
 
-    *result = rb_str_new("", 0);
+    *result = rb_str_buf_new(0);
     
-#line 1149 "parser.c"
+#line 1370 "parser.c"
 	{
 	cs = JSON_string_start;
 	}
-#line 358 "parser.rl"
+
+#line 478 "parser.rl"
     json->memo = p;
     
-#line 1156 "parser.c"
+#line 1378 "parser.c"
 	{
 	if ( p == pe )
-		goto _out;
+		goto _test_eof;
 	switch ( cs )
 	{
-case 0:
+case 1:
 	if ( (*p) == 34 )
 		goto st2;
-	goto st1;
-st1:
-	goto _out1;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
 st2:
 	if ( ++p == pe )
-		goto _out2;
+		goto _test_eof2;
 case 2:
 	switch( (*p) ) {
-		case 34: goto tr4;
+		case 34: goto tr2;
 		case 92: goto st3;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
-		goto st1;
+		goto st0;
 	goto st2;
-tr4:
-#line 342 "parser.rl"
+tr2:
+#line 456 "parser.rl"
 	{
-        *result = json_string_escape(json->memo + 1, p);
-        if (NIL_P(*result)) goto _out8; else {p = (( p + 1))-1;}
-    }
-#line 347 "parser.rl"
-	{ goto _out8; }
+        *result = json_string_unescape(*result, json->memo + 1, p);
+        if (NIL_P(*result)) {
+			p--;
+			{p++; cs = 8; goto _out;}
+		} else {
+			FORCE_UTF8(*result);
+			{p = (( p + 1))-1;}
+		}
+	}
+#line 467 "parser.rl"
+	{ p--; {p++; cs = 8; goto _out;} }
 	goto st8;
 st8:
 	if ( ++p == pe )
-		goto _out8;
+		goto _test_eof8;
 case 8:
-#line 1192 "parser.c"
-	goto st1;
+#line 1421 "parser.c"
+	goto st0;
 st3:
 	if ( ++p == pe )
-		goto _out3;
+		goto _test_eof3;
 case 3:
-	switch( (*p) ) {
-		case 34: goto st2;
-		case 47: goto st2;
-		case 92: goto st2;
-		case 98: goto st2;
-		case 102: goto st2;
-		case 110: goto st2;
-		case 114: goto st2;
-		case 116: goto st2;
-		case 117: goto st4;
-	}
-	goto st1;
+	if ( (*p) == 117 )
+		goto st4;
+	if ( 0 <= (*p) && (*p) <= 31 )
+		goto st0;
+	goto st2;
 st4:
 	if ( ++p == pe )
-		goto _out4;
+		goto _test_eof4;
 case 4:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
@@ -1218,10 +1441,10 @@ case 4:
 			goto st5;
 	} else
 		goto st5;
-	goto st1;
+	goto st0;
 st5:
 	if ( ++p == pe )
-		goto _out5;
+		goto _test_eof5;
 case 5:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
@@ -1231,10 +1454,10 @@ case 5:
 			goto st6;
 	} else
 		goto st6;
-	goto st1;
+	goto st0;
 st6:
 	if ( ++p == pe )
-		goto _out6;
+		goto _test_eof6;
 case 6:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
@@ -1244,10 +1467,10 @@ case 6:
 			goto st7;
 	} else
 		goto st7;
-	goto st1;
+	goto st0;
 st7:
 	if ( ++p == pe )
-		goto _out7;
+		goto _test_eof7;
 case 7:
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
@@ -1257,21 +1480,25 @@ case 7:
 			goto st2;
 	} else
 		goto st2;
-	goto st1;
+	goto st0;
 	}
-	_out1: cs = 1; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out8: cs = 8; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out4: cs = 4; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out6: cs = 6; goto _out; 
-	_out7: cs = 7; goto _out; 
-
+	_test_eof2: cs = 2; goto _test_eof; 
+	_test_eof8: cs = 8; 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_eof6: cs = 6; goto _test_eof; 
+	_test_eof7: cs = 7; goto _test_eof; 
+
+	_test_eof: {}
 	_out: {}
 	}
-#line 360 "parser.rl"
 
+#line 480 "parser.rl"
+
+    if (json->symbolize_names && json->parsing_name) {
+      *result = rb_str_intern(*result);
+    }
     if (cs >= JSON_string_first_final) {
         return p + 1;
     } else {
@@ -1281,14 +1508,15 @@ case 7:
 
 
 
-#line 1285 "parser.c"
-static const int JSON_start = 0;
-
+#line 1511 "parser.c"
+static const int JSON_start = 1;
 static const int JSON_first_final = 10;
+static const int JSON_error = 0;
+
+static const int JSON_en_main = 1;
 
-static const int JSON_error = 1;
 
-#line 390 "parser.rl"
+#line 517 "parser.rl"
 
 
 /* 
@@ -1303,38 +1531,156 @@ static const int JSON_error = 1;
  *
  */
 
-/*
- * call-seq: new(source)
- *
- * Creates a new JSON::Ext::Parser instance for the string _source_.
- */
-static VALUE cParser_initialize(VALUE self, VALUE source)
+static VALUE convert_encoding(VALUE source)
 {
-    char *ptr;
-    long len;
-    GET_STRUCT;
-    source = StringValue(source);
-    ptr = RSTRING(source)->ptr;
-    len = RSTRING(source)->len;
+    char *ptr = RSTRING_PTR(source);
+    long len = RSTRING_LEN(source);
     if (len < 2) {
         rb_raise(eParserError, "A JSON text must at least contain two octets!");
     }
-    /*
-       Convert these?
+#ifdef HAVE_RUBY_ENCODING_H
+    {
+        VALUE encoding = rb_funcall(source, i_encoding, 0);
+        if (encoding == CEncoding_ASCII_8BIT) {
+            if (len >= 4 &&  ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
+                source = rb_str_dup(source);
+                rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_32BE);
+                source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
+            } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
+                source = rb_str_dup(source);
+                rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_16BE);
+                source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
+            } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
+                source = rb_str_dup(source);
+                rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_32LE);
+                source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
+            } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
+                source = rb_str_dup(source);
+                rb_funcall(source, i_force_encoding, 1, CEncoding_UTF_16LE);
+                source = rb_funcall(source, i_encode_bang, 1, CEncoding_UTF_8);
+            } else {
+                FORCE_UTF8(source);
+            }
+        } else {
+            source = rb_funcall(source, i_encode, 1, CEncoding_UTF_8);
+        }
+    }
+#else
     if (len >= 4 &&  ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0) {
-        rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
+      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-32be"), source);
     } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
-        rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
+      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-16be"), source);
     } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
-        rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
+      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-32le"), source);
     } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
-        rb_raise(eParserError, "Only UTF8 octet streams are supported atm!");
+      source = rb_funcall(mJSON, i_iconv, 3, rb_str_new2("utf-8"), rb_str_new2("utf-16le"), source);
     }
-    */
+#endif
+    return source;
+}
+
+/*
+ * call-seq: new(source, opts => {})
+ *
+ * Creates a new JSON::Ext::Parser instance for the string _source_.
+ *
+ * Creates a new JSON::Ext::Parser instance for the string _source_.
+ *
+ * It will be configured by the _opts_ hash. _opts_ can have the following
+ * keys:
+ *
+ * _opts_ can have the following keys:
+ * * *max_nesting*: The maximum depth of nesting allowed in the parsed data
+ *   structures. Disable depth checking with :max_nesting => false|nil|0, it
+ *   defaults to 19.
+ * * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
+ *   defiance of RFC 4627 to be parsed by the Parser. This option defaults to
+ *   false.
+ * * *symbolize_names*: If set to true, returns symbols for the names
+ *   (keys) in a JSON object. Otherwise strings are returned, which is also
+ *   the default.
+ * * *create_additions*: If set to false, the Parser doesn't create
+ *   additions even if a matchin class and create_id was found. This option
+ *   defaults to true.
+ * * *object_class*: Defaults to Hash
+ * * *array_class*: Defaults to Array
+ */
+static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
+{
+    char *ptr;
+    long len;
+    VALUE source, opts;
+    GET_PARSER;
+    rb_scan_args(argc, argv, "11", &source, &opts);
+    source = convert_encoding(StringValue(source));
+    ptr = RSTRING_PTR(source);
+    len = RSTRING_LEN(source);
+    if (!NIL_P(opts)) {
+        opts = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
+        if (NIL_P(opts)) {
+            rb_raise(rb_eArgError, "opts needs to be like a hash");
+        } else {
+            VALUE tmp = ID2SYM(i_max_nesting);
+            if (option_given_p(opts, tmp)) {
+                VALUE max_nesting = rb_hash_aref(opts, tmp);
+                if (RTEST(max_nesting)) {
+                    Check_Type(max_nesting, T_FIXNUM);
+                    json->max_nesting = FIX2INT(max_nesting);
+                } else {
+                    json->max_nesting = 0;
+                }
+            } else {
+                json->max_nesting = 19;
+            }
+            tmp = ID2SYM(i_allow_nan);
+            if (option_given_p(opts, tmp)) {
+                VALUE allow_nan = rb_hash_aref(opts, tmp);
+                json->allow_nan = RTEST(allow_nan) ? 1 : 0;
+            } else {
+                json->allow_nan = 0;
+            }
+            tmp = ID2SYM(i_symbolize_names);
+            if (option_given_p(opts, tmp)) {
+                VALUE symbolize_names = rb_hash_aref(opts, tmp);
+                json->symbolize_names = RTEST(symbolize_names) ? 1 : 0;
+            } else {
+                json->symbolize_names = 0;
+            }
+            tmp = ID2SYM(i_create_additions);
+            if (option_given_p(opts, tmp)) {
+                VALUE create_additions = rb_hash_aref(opts, tmp);
+                if (RTEST(create_additions)) {
+                    json->create_id = rb_funcall(mJSON, i_create_id, 0);
+                } else {
+                    json->create_id = Qnil;
+                }
+            } else {
+                json->create_id = rb_funcall(mJSON, i_create_id, 0);
+            }
+            tmp = ID2SYM(i_object_class);
+            if (option_given_p(opts, tmp)) {
+                json->object_class = rb_hash_aref(opts, tmp);
+            } else {
+                json->object_class = Qnil;
+            }
+            tmp = ID2SYM(i_array_class);
+            if (option_given_p(opts, tmp)) {
+                json->array_class = rb_hash_aref(opts, tmp);
+            } else {
+                json->array_class = Qnil;
+            }
+        }
+    } else {
+        json->max_nesting = 19;
+        json->allow_nan = 0;
+        json->create_id = rb_funcall(mJSON, i_create_id, 0);
+        json->object_class = Qnil;
+        json->array_class = Qnil;
+    }
+    json->current_nesting = 0;
     json->len = len;
     json->source = ptr;
     json->Vsource = source;
-    json->create_id = rb_funcall(mJSON, i_create_id, 0);
     return self;
 }
 
@@ -1346,93 +1692,99 @@ static VALUE cParser_initialize(VALUE self, VALUE source)
  */
 static VALUE cParser_parse(VALUE self)
 {
-    GET_STRUCT;
     char *p, *pe;
     int cs = EVIL;
     VALUE result = Qnil;
+    GET_PARSER;
 
     
-#line 1356 "parser.c"
+#line 1701 "parser.c"
 	{
 	cs = JSON_start;
 	}
-#line 453 "parser.rl"
+
+#line 698 "parser.rl"
     p = json->source;
     pe = p + json->len;
     
-#line 1364 "parser.c"
+#line 1710 "parser.c"
 	{
 	if ( p == pe )
-		goto _out;
+		goto _test_eof;
 	switch ( cs )
 	{
-st0:
+st1:
 	if ( ++p == pe )
-		goto _out0;
-case 0:
+		goto _test_eof1;
+case 1:
 	switch( (*p) ) {
-		case 13: goto st0;
-		case 32: goto st0;
+		case 13: goto st1;
+		case 32: goto st1;
 		case 47: goto st2;
-		case 91: goto tr7;
-		case 123: goto tr8;
+		case 91: goto tr3;
+		case 123: goto tr4;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st0;
-	goto st1;
-st1:
-	goto _out1;
+		goto st1;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
 st2:
 	if ( ++p == pe )
-		goto _out2;
+		goto _test_eof2;
 case 2:
 	switch( (*p) ) {
 		case 42: goto st3;
 		case 47: goto st5;
 	}
-	goto st1;
+	goto st0;
 st3:
 	if ( ++p == pe )
-		goto _out3;
+		goto _test_eof3;
 case 3:
 	if ( (*p) == 42 )
 		goto st4;
 	goto st3;
 st4:
 	if ( ++p == pe )
-		goto _out4;
+		goto _test_eof4;
 case 4:
 	switch( (*p) ) {
 		case 42: goto st4;
-		case 47: goto st0;
+		case 47: goto st1;
 	}
 	goto st3;
 st5:
 	if ( ++p == pe )
-		goto _out5;
+		goto _test_eof5;
 case 5:
 	if ( (*p) == 10 )
-		goto st0;
+		goto st1;
 	goto st5;
-tr7:
-#line 381 "parser.rl"
+tr3:
+#line 506 "parser.rl"
 	{
-        char *np = JSON_parse_array(json, p, pe, &result);
-        if (np == NULL) goto _out10; else {p = (( np))-1;}
+        char *np;
+        json->current_nesting = 1;
+        np = JSON_parse_array(json, p, pe, &result);
+        if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
     }
 	goto st10;
-tr8:
-#line 376 "parser.rl"
+tr4:
+#line 499 "parser.rl"
 	{
-        char *np = JSON_parse_object(json, p, pe, &result);
-        if (np == NULL) goto _out10; else {p = (( np))-1;}
+        char *np;
+        json->current_nesting = 1;
+        np = JSON_parse_object(json, p, pe, &result);
+        if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
     }
 	goto st10;
 st10:
 	if ( ++p == pe )
-		goto _out10;
+		goto _test_eof10;
 case 10:
-#line 1436 "parser.c"
+#line 1787 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -1440,26 +1792,26 @@ case 10:
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
 		goto st10;
-	goto st1;
+	goto st0;
 st6:
 	if ( ++p == pe )
-		goto _out6;
+		goto _test_eof6;
 case 6:
 	switch( (*p) ) {
 		case 42: goto st7;
 		case 47: goto st9;
 	}
-	goto st1;
+	goto st0;
 st7:
 	if ( ++p == pe )
-		goto _out7;
+		goto _test_eof7;
 case 7:
 	if ( (*p) == 42 )
 		goto st8;
 	goto st7;
 st8:
 	if ( ++p == pe )
-		goto _out8;
+		goto _test_eof8;
 case 8:
 	switch( (*p) ) {
 		case 42: goto st8;
@@ -1468,32 +1820,34 @@ case 8:
 	goto st7;
 st9:
 	if ( ++p == pe )
-		goto _out9;
+		goto _test_eof9;
 case 9:
 	if ( (*p) == 10 )
 		goto st10;
 	goto st9;
 	}
-	_out0: cs = 0; goto _out; 
-	_out1: cs = 1; goto _out; 
-	_out2: cs = 2; goto _out; 
-	_out3: cs = 3; goto _out; 
-	_out4: cs = 4; goto _out; 
-	_out5: cs = 5; goto _out; 
-	_out10: cs = 10; goto _out; 
-	_out6: cs = 6; goto _out; 
-	_out7: cs = 7; goto _out; 
-	_out8: cs = 8; goto _out; 
-	_out9: cs = 9; goto _out; 
-
+	_test_eof1: cs = 1; goto _test_eof; 
+	_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_eof10: cs = 10; goto _test_eof; 
+	_test_eof6: cs = 6; goto _test_eof; 
+	_test_eof7: cs = 7; goto _test_eof; 
+	_test_eof8: cs = 8; goto _test_eof; 
+	_test_eof9: cs = 9; goto _test_eof; 
+
+	_test_eof: {}
 	_out: {}
 	}
-#line 456 "parser.rl"
+
+#line 701 "parser.rl"
 
     if (cs >= JSON_first_final && p == pe) {
         return result;
     } else {
-        rb_raise(eParserError, "unexpected token at '%s'", p);
+        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        return Qnil;
     }
 }
 
@@ -1508,11 +1862,13 @@ static void JSON_mark(JSON_Parser *json)
 {
     rb_gc_mark_maybe(json->Vsource);
     rb_gc_mark_maybe(json->create_id);
+    rb_gc_mark_maybe(json->object_class);
+    rb_gc_mark_maybe(json->array_class);
 }
 
 static void JSON_free(JSON_Parser *json)
 {
-    free(json);
+    ruby_xfree(json);
 }
 
 static VALUE cJSON_parser_s_allocate(VALUE klass)
@@ -1529,23 +1885,51 @@ static VALUE cJSON_parser_s_allocate(VALUE klass)
  */
 static VALUE cParser_source(VALUE self)
 {
-    GET_STRUCT;
+    GET_PARSER;
     return rb_str_dup(json->Vsource);
 }
 
 void Init_parser()
 {
+    rb_require("json/common");
     mJSON = rb_define_module("JSON");
     mExt = rb_define_module_under(mJSON, "Ext");
     cParser = rb_define_class_under(mExt, "Parser", rb_cObject);
     eParserError = rb_path2class("JSON::ParserError");
+    eNestingError = rb_path2class("JSON::NestingError");
     rb_define_alloc_func(cParser, cJSON_parser_s_allocate);
-    rb_define_method(cParser, "initialize", cParser_initialize, 1);
+    rb_define_method(cParser, "initialize", cParser_initialize, -1);
     rb_define_method(cParser, "parse", cParser_parse, 0);
     rb_define_method(cParser, "source", cParser_source, 0);
 
+    CNaN = rb_const_get(mJSON, rb_intern("NaN"));
+    CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
+    CMinusInfinity = rb_const_get(mJSON, rb_intern("MinusInfinity"));
+
     i_json_creatable_p = rb_intern("json_creatable?");
     i_json_create = rb_intern("json_create");
     i_create_id = rb_intern("create_id");
+    i_create_additions = rb_intern("create_additions");
     i_chr = rb_intern("chr");
+    i_max_nesting = rb_intern("max_nesting");
+    i_allow_nan = rb_intern("allow_nan");
+    i_symbolize_names = rb_intern("symbolize_names");
+    i_object_class = rb_intern("object_class");
+    i_array_class = rb_intern("array_class");
+    i_key_p = rb_intern("key?");
+    i_deep_const_get = rb_intern("deep_const_get");
+#ifdef HAVE_RUBY_ENCODING_H
+    CEncoding_UTF_8 = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-8"));
+    CEncoding_UTF_16BE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-16be"));
+    CEncoding_UTF_16LE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-16le"));
+    CEncoding_UTF_32BE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-32be"));
+    CEncoding_UTF_32LE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-32le"));
+    CEncoding_ASCII_8BIT = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("ascii-8bit"));
+    i_encoding = rb_intern("encoding");
+    i_encode = rb_intern("encode");
+    i_encode_bang = rb_intern("encode!");
+    i_force_encoding = rb_intern("force_encoding");
+#else
+    i_iconv = rb_intern("iconv");
+#endif
 }