json-maglev- 1.5.4 → 1.6.1

data/CHANGES

@@ -1,6 +1,16 @@
-2011-07-04 (1.5.4)
+2011-09-18 (1.6.1)
+  * Using -target 1.5 to force Java bits to compile with 1.5.
+2011-09-12 (1.6.0)
+  * Extract utilities (prettifier and GUI-editor) in its own gem json-utils.
+  * Split json/add/core into different files for classes to be serialised.
+2011-08-31 (1.5.4)
   * Fix memory leak when used from multiple JRuby. (Patch by
     jfirebaugh@github).
+  * Apply patch by Eric Wong <nocode@yhbt.net> that fixes garbage collection problem
+    reported in https://github.com/flori/json/issues/46.
+  * Add :quirks_mode option to parser and generator.
+  * Add support for Rational and Complex number additions via json/add/complex
+    and json/add/rational requires.
 2011-06-20 (1.5.3)
   * Alias State#configure method as State#merge to increase duck type synonymy with Hash.
 	* Add as_json methods in json/add/core, so rails can create its json objects

data/Rakefile

@@ -4,7 +4,12 @@ rescue LoadError
 end
 
 require 'rbconfig'
-include Config
+begin
+  include RbConfig
+rescue NameError
+  include Config
+end
+
 
 require 'rake/clean'
 CLOBBER.include Dir['benchmarks/data/*.{dat,log}'], 'doc', 'Gemfile.lock'
@@ -91,10 +96,6 @@ if defined?(Gem) and defined?(Gem::PackageTask)
     s.add_development_dependency 'bullshit'
     s.add_development_dependency 'sdoc'
     s.add_development_dependency 'rake', '~>0.9.2'
-    s.add_dependency 'spruz', '~>0.2.8'
-
-    s.bindir = "bin"
-    s.executables = [ "edit_json.rb", "prettify_json.rb" ]
 
     s.extra_rdoc_files << 'README.rdoc'
     s.rdoc_options <<
@@ -136,9 +137,6 @@ if defined?(Gem) and defined?(Gem::PackageTask)
     s.add_development_dependency 'bullshit'
     s.add_development_dependency 'sdoc'
 
-    s.bindir = "bin"
-    s.executables = [ "edit_json.rb", "prettify_json.rb" ]
-
     s.extra_rdoc_files << 'README.rdoc'
     s.rdoc_options <<
       '--title' <<  'JSON implemention for Ruby' << '--main' << 'README.rdoc'
@@ -228,13 +226,13 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
     rm_rf JAVA_PARSER_SRC
   end
 
-  JRUBY_JAR = File.join(Config::CONFIG["libdir"], "jruby.jar")
+  JRUBY_JAR = File.join(CONFIG["libdir"], "jruby.jar")
   if File.exist?(JRUBY_JAR)
     JAVA_SOURCES.each do |src|
       classpath = (Dir['java/lib/*.jar'] << 'java/src' << JRUBY_JAR) * ':'
       obj = src.sub(/\.java\Z/, '.class')
       file obj => src do
-        sh 'javac', '-classpath', classpath, '-source', '1.5', src
+        sh 'javac', '-classpath', classpath, '-source', '1.5', '-target', '1.5', src
       end
       JAVA_CLASSES << obj
     end
@@ -298,7 +296,9 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
   task :create_jar => [ :create_parser_jar, :create_generator_jar ]
 
   desc "Build all gems and archives for a new release of the jruby extension."
-  task :release => [ :clean, :version, :jruby_gem ]
+  task :build => [ :clean, :version, :jruby_gem ]
+
+  task :release => :build
 else
   desc "Compiling extension"
   task :compile => [ EXT_PARSER_DL, EXT_GENERATOR_DL ]
@@ -400,7 +400,9 @@ else
   task :ragel_dot => [ :ragel_dot_png, :ragel_dot_ps ]
 
   desc "Build all gems and archives for a new release of json and json_pure."
-  task :release => [ :clean, :gemspec, :package ]
+  task :build => [ :clean, :gemspec, :package ]
+
+  task :release => :build
 end
 
 desc "Compile in the the source directory"

data/VERSION

@@ -1 +1 @@
-1.5.4
+1.6.1

data/ext/json/ext/generator/extconf.rb

@@ -1,5 +1,4 @@
 require 'mkmf'
-require 'rbconfig'
 
 unless $CFLAGS.gsub!(/ -O[\dsz]?/, ' -O3')
   $CFLAGS << ' -O3'
@@ -11,10 +10,4 @@ if CONFIG['CC'] =~ /gcc/
   #end
 end
 
-if RUBY_VERSION < "1.9"
-  have_header("re.h")
-else
-  have_header("ruby/re.h")
-  have_header("ruby/encoding.h")
-end
 create_makefile 'json/ext/generator'

data/ext/json/ext/generator/generator.c

@@ -13,8 +13,8 @@ static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
 
 static ID i_to_s, i_to_json, i_new, i_indent, i_space, i_space_before,
           i_object_nl, i_array_nl, i_max_nesting, i_allow_nan, i_ascii_only,
-          i_pack, i_unpack, i_create_id, i_extend, i_key_p, i_aref, i_send,
-          i_respond_to_p, i_match, i_keys, i_depth, i_dup;
+          i_quirks_mode, i_pack, i_unpack, i_create_id, i_extend, i_key_p,
+          i_aref, i_send, i_respond_to_p, i_match, i_keys, i_depth, i_dup;
 
 /*
  * Copyright 2001-2004 Unicode, Inc.
@@ -349,6 +349,16 @@ static void fbuffer_append(FBuffer *fb, const char *newstr, unsigned long len)
     }
 }
 
+static void fbuffer_append_str(FBuffer *fb, VALUE str)
+{
+    const char *newstr = StringValuePtr(str);
+    unsigned long len = RSTRING_LEN(str);
+
+    RB_GC_GUARD(str);
+
+    fbuffer_append(fb, newstr, len);
+}
+
 static void fbuffer_append_char(FBuffer *fb, char newchr)
 {
     fbuffer_inc_capa(fb, 1);
@@ -688,6 +698,8 @@ static VALUE cState_configure(VALUE self, VALUE opts)
     state->allow_nan = RTEST(tmp);
     tmp = rb_hash_aref(opts, ID2SYM(i_ascii_only));
     state->ascii_only = RTEST(tmp);
+    tmp = rb_hash_aref(opts, ID2SYM(i_quirks_mode));
+    state->quirks_mode = RTEST(tmp);
     return self;
 }
 
@@ -708,6 +720,7 @@ static VALUE cState_to_h(VALUE self)
     rb_hash_aset(result, ID2SYM(i_array_nl), rb_str_new(state->array_nl, state->array_nl_len));
     rb_hash_aset(result, ID2SYM(i_allow_nan), state->allow_nan ? Qtrue : Qfalse);
     rb_hash_aset(result, ID2SYM(i_ascii_only), state->ascii_only ? Qtrue : Qfalse);
+    rb_hash_aset(result, ID2SYM(i_quirks_mode), state->quirks_mode ? Qtrue : Qfalse);
     rb_hash_aset(result, ID2SYM(i_max_nesting), LONG2FIX(state->max_nesting));
     rb_hash_aset(result, ID2SYM(i_depth), LONG2FIX(state->depth));
     return result;
@@ -852,7 +865,7 @@ static void generate_json_fixnum(FBuffer *buffer, VALUE Vstate, JSON_Generator_S
 static void generate_json_bignum(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
 {
     VALUE tmp = rb_funcall(obj, i_to_s, 0);
-    fbuffer_append(buffer, RSTRING_PAIR(tmp));
+    fbuffer_append_str(buffer, tmp);
 }
 
 static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
@@ -869,7 +882,7 @@ static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_St
             rb_raise(eGeneratorError, "%u: %s not allowed in JSON", __LINE__, StringValueCStr(tmp));
         }
     }
-    fbuffer_append(buffer, RSTRING_PAIR(tmp));
+    fbuffer_append_str(buffer, tmp);
 }
 
 static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
@@ -897,7 +910,7 @@ static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *s
     } else if (rb_respond_to(obj, i_to_json)) {
         tmp = rb_funcall(obj, i_to_json, 1, Vstate);
         Check_Type(tmp, T_STRING);
-        fbuffer_append(buffer, RSTRING_PAIR(tmp));
+        fbuffer_append_str(buffer, tmp);
     } else {
         tmp = rb_funcall(obj, i_to_s, 0);
         Check_Type(tmp, T_STRING);
@@ -961,11 +974,14 @@ static VALUE cState_generate(VALUE self, VALUE obj)
 {
     VALUE result = cState_partial_generate(self, obj);
     VALUE re, args[2];
-    args[0] = rb_str_new2("\\A\\s*(?:\\[.*\\]|\\{.*\\})\\s*\\Z");
-    args[1] = CRegexp_MULTILINE;
-    re = rb_class_new_instance(2, args, rb_cRegexp);
-    if (NIL_P(rb_funcall(re, i_match, 1, result))) {
-        rb_raise(eGeneratorError, "only generation of JSON objects or arrays allowed");
+    GET_STATE(self);
+    if (!state->quirks_mode) {
+        args[0] = rb_str_new2("\\A\\s*(?:\\[.*\\]|\\{.*\\})\\s*\\Z");
+        args[1] = CRegexp_MULTILINE;
+        re = rb_class_new_instance(2, args, rb_cRegexp);
+        if (NIL_P(rb_funcall(re, i_match, 1, result))) {
+            rb_raise(eGeneratorError, "only generation of JSON objects or arrays allowed");
+        }
     }
     return result;
 }
@@ -985,6 +1001,8 @@ static VALUE cState_generate(VALUE self, VALUE obj)
  * * *allow_nan*: true if NaN, Infinity, and -Infinity should be
  *   generated, otherwise an exception is thrown, if these values are
  *   encountered. This options defaults to false.
+ * * *quirks_mode*: Enables quirks_mode for parser, that is for example
+ *   generating single JSON values instead of documents is possible.
  */
 static VALUE cState_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -1287,6 +1305,29 @@ static VALUE cState_ascii_only_p(VALUE self)
     return state->ascii_only ? Qtrue : Qfalse;
 }
 
+/*
+ * call-seq: quirks_mode?
+ *
+ * Returns true, if quirks mode is enabled. Otherwise returns false.
+ */
+static VALUE cState_quirks_mode_p(VALUE self)
+{
+    GET_STATE(self);
+    return state->quirks_mode ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq: quirks_mode=(enable)
+ *
+ * If set to true, enables the quirks_mode mode.
+ */
+static VALUE cState_quirks_mode_set(VALUE self, VALUE enable)
+{
+    GET_STATE(self);
+    state->quirks_mode = RTEST(enable);
+    return Qnil;
+}
+
 /*
  * call-seq: depth
  *
@@ -1345,6 +1386,9 @@ void Init_generator()
     rb_define_method(cState, "check_circular?", cState_check_circular_p, 0);
     rb_define_method(cState, "allow_nan?", cState_allow_nan_p, 0);
     rb_define_method(cState, "ascii_only?", cState_ascii_only_p, 0);
+    rb_define_method(cState, "quirks_mode?", cState_quirks_mode_p, 0);
+    rb_define_method(cState, "quirks_mode", cState_quirks_mode_p, 0);
+    rb_define_method(cState, "quirks_mode=", cState_quirks_mode_set, 1);
     rb_define_method(cState, "depth", cState_depth, 0);
     rb_define_method(cState, "depth=", cState_depth_set, 1);
     rb_define_method(cState, "configure", cState_configure, 1);
@@ -1392,6 +1436,7 @@ void Init_generator()
     i_max_nesting = rb_intern("max_nesting");
     i_allow_nan = rb_intern("allow_nan");
     i_ascii_only = rb_intern("ascii_only");
+    i_quirks_mode = rb_intern("quirks_mode");
     i_depth = rb_intern("depth");
     i_pack = rb_intern("pack");
     i_unpack = rb_intern("unpack");

data/ext/json/ext/generator/generator.h

@@ -7,11 +7,9 @@
 
 #include "ruby.h"
 
-#if HAVE_RUBY_RE_H
+#ifdef HAVE_RUBY_RE_H
 #include "ruby/re.h"
-#endif
-
-#if HAVE_RE_H
+#else
 #include "re.h"
 #endif
 
@@ -45,7 +43,10 @@
 #define RSTRING_LEN(string) RSTRING(string)->len
 #endif
 
-#define RSTRING_PAIR(string) RSTRING_PTR(string), RSTRING_LEN(string)
+/* We don't need to guard objects for rbx, so let's do nothing at all. */
+#ifndef RB_GC_GUARD
+#define RB_GC_GUARD(object)
+#endif
 
 /* fbuffer implementation */
 
@@ -123,6 +124,7 @@ typedef struct JSON_Generator_StateStruct {
     long max_nesting;
     char allow_nan;
     char ascii_only;
+    char quirks_mode;
     long depth;
 } JSON_Generator_State;
 

data/ext/json/ext/parser/extconf.rb

@@ -1,5 +1,4 @@
 require 'mkmf'
-require 'rbconfig'
 
 unless $CFLAGS.gsub!(/ -O[\dsz]?/, ' -O3')
   $CFLAGS << ' -O3'
@@ -11,6 +10,4 @@ if CONFIG['CC'] =~ /gcc/
   #end
 end
 
-have_header("re.h")
-have_header("ruby/st.h")
 create_makefile 'json/ext/parser'

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

@@ -78,15 +78,16 @@ static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
 static VALUE CNaN, CInfinity, CMinusInfinity;
 
 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, i_match, i_match_string, i_aset, i_leftshift;
+          i_chr, i_max_nesting, i_allow_nan, i_symbolize_names, i_quirks_mode,
+          i_object_class, i_array_class, i_key_p, i_deep_const_get, i_match,
+          i_match_string, i_aset, i_leftshift;
 
 
-#line 108 "parser.rl"
+#line 109 "parser.rl"
 
 
 
-#line 90 "parser.c"
+#line 91 "parser.c"
 static const int JSON_object_start = 1;
 static const int JSON_object_first_final = 27;
 static const int JSON_object_error = 0;
@@ -94,10 +95,10 @@ static const int JSON_object_error = 0;
 static const int JSON_object_en_main = 1;
 
 
-#line 148 "parser.rl"
+#line 150 "parser.rl"
 
 
-static const char *JSON_parse_object(JSON_Parser *json, const char *p, const char *pe, VALUE *result)
+static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
     VALUE last_name = Qnil;
@@ -110,14 +111,14 @@ static const char *JSON_parse_object(JSON_Parser *json, const char *p, const cha
     *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
 
 
-#line 114 "parser.c"
+#line 115 "parser.c"
 	{
 	cs = JSON_object_start;
 	}
 
-#line 163 "parser.rl"
+#line 165 "parser.rl"
 
-#line 121 "parser.c"
+#line 122 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -145,9 +146,9 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 131 "parser.rl"
+#line 132 "parser.rl"
 	{
-        const char *np;
+        char *np;
         json->parsing_name = 1;
         np = JSON_parse_string(json, p, pe, &last_name);
         json->parsing_name = 0;
@@ -158,7 +159,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 162 "parser.c"
+#line 163 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -225,10 +226,10 @@ case 8:
 		goto st8;
 	goto st0;
 tr11:
-#line 116 "parser.rl"
+#line 117 "parser.rl"
 	{
         VALUE v = Qnil;
-        const char *np = JSON_parse_value(json, p, pe, &v);
+        char *np = JSON_parse_value(json, p, pe, &v);
         if (np == NULL) {
             p--; {p++; cs = 9; goto _out;}
         } else {
@@ -245,7 +246,7 @@ st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 249 "parser.c"
+#line 250 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st9;
 		case 32: goto st9;
@@ -334,14 +335,14 @@ case 18:
 		goto st9;
 	goto st18;
 tr4:
-#line 139 "parser.rl"
+#line 140 "parser.rl"
 	{ p--; {p++; cs = 27; goto _out;} }
 	goto st27;
 st27:
 	if ( ++p == pe )
 		goto _test_eof27;
 case 27:
-#line 345 "parser.c"
+#line 346 "parser.c"
 	goto st0;
 st19:
 	if ( ++p == pe )
@@ -439,7 +440,7 @@ case 26:
 	_out: {}
 	}
 
-#line 164 "parser.rl"
+#line 166 "parser.rl"
 
     if (cs >= JSON_object_first_final) {
         if (json->create_additions) {
@@ -458,7 +459,8 @@ case 26:
 }
 
 
-#line 462 "parser.c"
+
+#line 464 "parser.c"
 static const int JSON_value_start = 1;
 static const int JSON_value_first_final = 21;
 static const int JSON_value_error = 0;
@@ -466,22 +468,22 @@ static const int JSON_value_error = 0;
 static const int JSON_value_en_main = 1;
 
 
-#line 262 "parser.rl"
+#line 265 "parser.rl"
 
 
-static const char *JSON_parse_value(JSON_Parser *json, const char *p, const char *pe, VALUE *result)
+static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
 
 
-#line 478 "parser.c"
+#line 480 "parser.c"
 	{
 	cs = JSON_value_start;
 	}
 
-#line 269 "parser.rl"
+#line 272 "parser.rl"
 
-#line 485 "parser.c"
+#line 487 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -506,17 +508,17 @@ st0:
 cs = 0;
 	goto _out;
 tr0:
-#line 210 "parser.rl"
+#line 213 "parser.rl"
 	{
-        const char *np = JSON_parse_string(json, p, pe, result);
+        char *np = JSON_parse_string(json, p, pe, result);
         if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
     }
 	goto st21;
 tr2:
-#line 215 "parser.rl"
+#line 218 "parser.rl"
 	{
-        const char *np;
-        if(pe > p + 9 && !strncmp(MinusInfinity, p, 9)) {
+        char *np;
+        if(pe > p + 9 - json->quirks_mode && !strncmp(MinusInfinity, p, 9)) {
             if (json->allow_nan) {
                 *result = CMinusInfinity;
                 {p = (( p + 10))-1;}
@@ -533,9 +535,9 @@ tr2:
     }
 	goto st21;
 tr5:
-#line 233 "parser.rl"
+#line 236 "parser.rl"
 	{
-        const char *np;
+        char *np;
         json->current_nesting++;
         np = JSON_parse_array(json, p, pe, result);
         json->current_nesting--;
@@ -543,9 +545,9 @@ tr5:
     }
 	goto st21;
 tr9:
-#line 241 "parser.rl"
+#line 244 "parser.rl"
 	{
-        const char *np;
+        char *np;
         json->current_nesting++;
         np =  JSON_parse_object(json, p, pe, result);
         json->current_nesting--;
@@ -553,7 +555,7 @@ tr9:
     }
 	goto st21;
 tr16:
-#line 203 "parser.rl"
+#line 206 "parser.rl"
 	{
         if (json->allow_nan) {
             *result = CInfinity;
@@ -563,7 +565,7 @@ tr16:
     }
 	goto st21;
 tr18:
-#line 196 "parser.rl"
+#line 199 "parser.rl"
 	{
         if (json->allow_nan) {
             *result = CNaN;
@@ -573,19 +575,19 @@ tr18:
     }
 	goto st21;
 tr22:
-#line 190 "parser.rl"
+#line 193 "parser.rl"
 	{
         *result = Qfalse;
     }
 	goto st21;
 tr25:
-#line 187 "parser.rl"
+#line 190 "parser.rl"
 	{
         *result = Qnil;
     }
 	goto st21;
 tr28:
-#line 193 "parser.rl"
+#line 196 "parser.rl"
 	{
         *result = Qtrue;
     }
@@ -594,9 +596,9 @@ st21:
 	if ( ++p == pe )
 		goto _test_eof21;
 case 21:
-#line 249 "parser.rl"
+#line 252 "parser.rl"
 	{ p--; {p++; cs = 21; goto _out;} }
-#line 600 "parser.c"
+#line 602 "parser.c"
 	goto st0;
 st2:
 	if ( ++p == pe )
@@ -757,7 +759,7 @@ case 20:
 	_out: {}
 	}
 
-#line 270 "parser.rl"
+#line 273 "parser.rl"
 
     if (cs >= JSON_value_first_final) {
         return p;
@@ -767,31 +769,31 @@ case 20:
 }
 
 
-#line 771 "parser.c"
+#line 773 "parser.c"
 static const int JSON_integer_start = 1;
-static const int JSON_integer_first_final = 5;
+static const int JSON_integer_first_final = 3;
 static const int JSON_integer_error = 0;
 
 static const int JSON_integer_en_main = 1;
 
 
-#line 286 "parser.rl"
+#line 289 "parser.rl"
 
 
-static const char *JSON_parse_integer(JSON_Parser *json, const char *p, const char *pe, VALUE *result)
+static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
 
 
-#line 787 "parser.c"
+#line 789 "parser.c"
 	{
 	cs = JSON_integer_start;
 	}
 
-#line 293 "parser.rl"
+#line 296 "parser.rl"
     json->memo = p;
 
-#line 795 "parser.c"
+#line 797 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -803,7 +805,7 @@ case 1:
 		case 48: goto st3;
 	}
 	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st4;
+		goto st5;
 	goto st0;
 st0:
 cs = 0;
@@ -815,7 +817,7 @@ case 2:
 	if ( (*p) == 48 )
 		goto st3;
 	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st4;
+		goto st5;
 	goto st0;
 st3:
 	if ( ++p == pe )
@@ -825,33 +827,33 @@ case 3:
 		goto st0;
 	goto tr4;
 tr4:
-#line 283 "parser.rl"
-	{ p--; {p++; cs = 5; goto _out;} }
-	goto st5;
-st5:
-	if ( ++p == pe )
-		goto _test_eof5;
-case 5:
-#line 836 "parser.c"
-	goto st0;
+#line 286 "parser.rl"
+	{ p--; {p++; cs = 4; goto _out;} }
+	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
+#line 838 "parser.c"
+	goto st0;
+st5:
+	if ( ++p == pe )
+		goto _test_eof5;
+case 5:
 	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st4;
+		goto st5;
 	goto tr4;
 	}
 	_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_eof5: cs = 5; goto _test_eof;
 
 	_test_eof: {}
 	_out: {}
 	}
 
-#line 295 "parser.rl"
+#line 298 "parser.rl"
 
     if (cs >= JSON_integer_first_final) {
         long len = p - json->memo;
@@ -863,31 +865,31 @@ case 4:
 }
 
 
-#line 867 "parser.c"
+#line 869 "parser.c"
 static const int JSON_float_start = 1;
-static const int JSON_float_first_final = 10;
+static const int JSON_float_first_final = 8;
 static const int JSON_float_error = 0;
 
 static const int JSON_float_en_main = 1;
 
 
-#line 317 "parser.rl"
+#line 320 "parser.rl"
 
 
-static const char *JSON_parse_float(JSON_Parser *json, const char *p, const char *pe, VALUE *result)
+static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
 
 
-#line 883 "parser.c"
+#line 885 "parser.c"
 	{
 	cs = JSON_float_start;
 	}
 
-#line 324 "parser.rl"
+#line 327 "parser.rl"
     json->memo = p;
 
-#line 891 "parser.c"
+#line 893 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -899,7 +901,7 @@ case 1:
 		case 48: goto st3;
 	}
 	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st9;
+		goto st7;
 	goto st0;
 st0:
 cs = 0;
@@ -911,7 +913,7 @@ case 2:
 	if ( (*p) == 48 )
 		goto st3;
 	if ( 49 <= (*p) && (*p) <= 57 )
-		goto st9;
+		goto st7;
 	goto st0;
 st3:
 	if ( ++p == pe )
@@ -919,8 +921,8 @@ st3:
 case 3:
 	switch( (*p) ) {
 		case 46: goto st4;
-		case 69: goto st6;
-		case 101: goto st6;
+		case 69: goto st5;
+		case 101: goto st5;
 	}
 	goto st0;
 st4:
@@ -928,92 +930,92 @@ st4:
 		goto _test_eof4;
 case 4:
 	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st5;
+		goto st8;
 	goto st0;
-st5:
+st8:
 	if ( ++p == pe )
-		goto _test_eof5;
-case 5:
+		goto _test_eof8;
+case 8:
 	switch( (*p) ) {
-		case 69: goto st6;
-		case 101: goto st6;
+		case 69: goto st5;
+		case 101: goto st5;
 	}
 	if ( (*p) > 46 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st5;
+			goto st8;
 	} else if ( (*p) >= 45 )
 		goto st0;
-	goto tr7;
-tr7:
-#line 311 "parser.rl"
-	{ p--; {p++; cs = 10; goto _out;} }
-	goto st10;
-st10:
+	goto tr9;
+tr9:
+#line 314 "parser.rl"
+	{ p--; {p++; cs = 9; goto _out;} }
+	goto st9;
+st9:
 	if ( ++p == pe )
-		goto _test_eof10;
-case 10:
-#line 956 "parser.c"
+		goto _test_eof9;
+case 9:
+#line 958 "parser.c"
 	goto st0;
-st6:
+st5:
 	if ( ++p == pe )
-		goto _test_eof6;
-case 6:
+		goto _test_eof5;
+case 5:
 	switch( (*p) ) {
-		case 43: goto st7;
-		case 45: goto st7;
+		case 43: goto st6;
+		case 45: goto st6;
 	}
 	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st8;
+		goto st10;
 	goto st0;
-st7:
+st6:
 	if ( ++p == pe )
-		goto _test_eof7;
-case 7:
+		goto _test_eof6;
+case 6:
 	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st8;
+		goto st10;
 	goto st0;
-st8:
+st10:
 	if ( ++p == pe )
-		goto _test_eof8;
-case 8:
+		goto _test_eof10;
+case 10:
 	switch( (*p) ) {
 		case 69: goto st0;
 		case 101: goto st0;
 	}
 	if ( (*p) > 46 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st8;
+			goto st10;
 	} else if ( (*p) >= 45 )
 		goto st0;
-	goto tr7;
-st9:
+	goto tr9;
+st7:
 	if ( ++p == pe )
-		goto _test_eof9;
-case 9:
+		goto _test_eof7;
+case 7:
 	switch( (*p) ) {
 		case 46: goto st4;
-		case 69: goto st6;
-		case 101: goto st6;
+		case 69: goto st5;
+		case 101: goto st5;
 	}
 	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st9;
+		goto st7;
 	goto st0;
 	}
 	_test_eof2: cs = 2; 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_eof5: cs = 5; goto _test_eof;
-	_test_eof10: cs = 10; goto _test_eof;
 	_test_eof6: cs = 6; goto _test_eof;
+	_test_eof10: cs = 10; 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 326 "parser.rl"
+#line 329 "parser.rl"
 
     if (cs >= JSON_float_first_final) {
         long len = p - json->memo;
@@ -1026,7 +1028,7 @@ case 9:
 
 
 
-#line 1030 "parser.c"
+#line 1032 "parser.c"
 static const int JSON_array_start = 1;
 static const int JSON_array_first_final = 17;
 static const int JSON_array_error = 0;
@@ -1034,10 +1036,10 @@ static const int JSON_array_error = 0;
 static const int JSON_array_en_main = 1;
 
 
-#line 366 "parser.rl"
+#line 369 "parser.rl"
 
 
-static const char *JSON_parse_array(JSON_Parser *json, const char *p, const char *pe, VALUE *result)
+static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
     VALUE array_class = json->array_class;
@@ -1048,14 +1050,14 @@ static const char *JSON_parse_array(JSON_Parser *json, const char *p, const char
     *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
 
 
-#line 1052 "parser.c"
+#line 1054 "parser.c"
 	{
 	cs = JSON_array_start;
 	}
 
-#line 379 "parser.rl"
+#line 382 "parser.rl"
 
-#line 1059 "parser.c"
+#line 1061 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1094,10 +1096,10 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 343 "parser.rl"
+#line 346 "parser.rl"
 	{
         VALUE v = Qnil;
-        const char *np = JSON_parse_value(json, p, pe, &v);
+        char *np = JSON_parse_value(json, p, pe, &v);
         if (np == NULL) {
             p--; {p++; cs = 3; goto _out;}
         } else {
@@ -1114,7 +1116,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 1118 "parser.c"
+#line 1120 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -1214,14 +1216,14 @@ case 12:
 		goto st3;
 	goto st12;
 tr4:
-#line 358 "parser.rl"
+#line 361 "parser.rl"
 	{ p--; {p++; cs = 17; goto _out;} }
 	goto st17;
 st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-#line 1225 "parser.c"
+#line 1227 "parser.c"
 	goto st0;
 st13:
 	if ( ++p == pe )
@@ -1277,7 +1279,7 @@ case 16:
 	_out: {}
 	}
 
-#line 380 "parser.rl"
+#line 383 "parser.rl"
 
     if(cs >= JSON_array_first_final) {
         return p + 1;
@@ -1287,9 +1289,9 @@ case 16:
     }
 }
 
-static VALUE json_string_unescape(VALUE result, const char *string, const char *stringEnd)
+static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
 {
-    const char *p = string, *pe = string, *unescape;
+    char *p = string, *pe = string, *unescape;
     int unescape_len;
 
     while (pe < stringEnd) {
@@ -1358,7 +1360,7 @@ static VALUE json_string_unescape(VALUE result, const char *string, const char *
 }
 
 
-#line 1362 "parser.c"
+#line 1364 "parser.c"
 static const int JSON_string_start = 1;
 static const int JSON_string_first_final = 8;
 static const int JSON_string_error = 0;
@@ -1366,7 +1368,7 @@ static const int JSON_string_error = 0;
 static const int JSON_string_en_main = 1;
 
 
-#line 479 "parser.rl"
+#line 482 "parser.rl"
 
 
 static int
@@ -1381,20 +1383,22 @@ match_i(VALUE regexp, VALUE klass, VALUE memo)
     return ST_CONTINUE;
 }
 
-static const char *JSON_parse_string(JSON_Parser *json, const char *p, const char *pe, VALUE *result)
+static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
+    VALUE match_string;
+
     *result = rb_str_buf_new(0);
 
-#line 1390 "parser.c"
+#line 1394 "parser.c"
 	{
 	cs = JSON_string_start;
 	}
 
-#line 498 "parser.rl"
+#line 503 "parser.rl"
     json->memo = p;
 
-#line 1398 "parser.c"
+#line 1402 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1419,7 +1423,7 @@ case 2:
 		goto st0;
 	goto st2;
 tr2:
-#line 465 "parser.rl"
+#line 468 "parser.rl"
 	{
         *result = json_string_unescape(*result, json->memo + 1, p);
         if (NIL_P(*result)) {
@@ -1430,14 +1434,14 @@ tr2:
             {p = (( p + 1))-1;}
         }
     }
-#line 476 "parser.rl"
+#line 479 "parser.rl"
 	{ p--; {p++; cs = 8; goto _out;} }
 	goto st8;
 st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-#line 1441 "parser.c"
+#line 1445 "parser.c"
 	goto st0;
 st3:
 	if ( ++p == pe )
@@ -1513,11 +1517,9 @@ case 7:
 	_out: {}
 	}
 
-#line 500 "parser.rl"
+#line 505 "parser.rl"
 
-    if (json->create_additions) {
-      VALUE match_string = json->match_string;
-      if (RTEST(match_string)) {
+    if (json->create_additions && RTEST(match_string = json->match_string)) {
           VALUE klass;
           VALUE memo = rb_ary_new2(2);
           rb_ary_push(memo, *result);
@@ -1526,7 +1528,6 @@ case 7:
           if (RTEST(klass)) {
               *result = rb_funcall(klass, i_json_create, 1, *result);
           }
-      }
     }
 
     if (json->symbolize_names && json->parsing_name) {
@@ -1539,19 +1540,6 @@ case 7:
     }
 }
 
-
-
-#line 1545 "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;
-
-
-#line 551 "parser.rl"
-
-
 /*
  * Document-class: JSON::Ext::Parser
  *
@@ -1566,7 +1554,7 @@ static const int JSON_en_main = 1;
 
 static VALUE convert_encoding(VALUE source)
 {
-    const char *ptr = RSTRING_PTR(source);
+    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!");
@@ -1605,12 +1593,15 @@ static VALUE convert_encoding(VALUE source)
     return source;
 }
 
-static inline void parser_iv_set(JSON_Parser *json, const char* iv_name, VALUE v)
-{
-  // store reference to v in a Ruby instVar to keep v alive
-  //  without using a gc_mark function in Data_Wrap_Struct calls
-  rb_iv_set(json->dwrapped_parser, iv_name, v);
-}
+#if defined MAGLEV
+// Maglev doesn't support the mark function, keep a reference in the object
+#define QUOTE(x) #x
+#define PARSER_SET_REFERENCE(json, field, val)                          \
+    (json)->field = (val);                                              \
+    rb_iv_set(json->dwrapped_parser, QUOTE(@field), (json)->field);
+#else
+#define PARSER_SET_REFERENCE(json, field, val) (json)->field = (val);
+#endif
 
 /*
  * call-seq: new(source, opts => {})
@@ -1637,27 +1628,19 @@ static inline void parser_iv_set(JSON_Parser *json, const char* iv_name, VALUE v
  *   defaults to true.
  * * *object_class*: Defaults to Hash
  * * *array_class*: Defaults to Array
+ * * *quirks_mode*: Enables quirks_mode for parser, that is for example
+ *   parsing single JSON values instead of documents is possible.
+ *
  */
-
-static int init_count = 0;
 static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 {
-    const char *ptr;
-    long len;
     VALUE source, opts;
-
     GET_PARSER_INIT;
-    init_count += 1;
 
-#ifndef MAGLEV
-    if (json->Vsource) {
+    if (RTEST(json->Vsource)) {
         rb_raise(rb_eTypeError, "already initialized instance");
     }
-#endif
     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)) {
@@ -1687,6 +1670,13 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->symbolize_names = 0;
             }
+            tmp = ID2SYM(i_quirks_mode);
+            if (option_given_p(opts, tmp)) {
+                VALUE quirks_mode = rb_hash_aref(opts, tmp);
+                json->quirks_mode = RTEST(quirks_mode) ? 1 : 0;
+            } else {
+                json->quirks_mode = 0;
+            }
             tmp = ID2SYM(i_create_additions);
             if (option_given_p(opts, tmp)) {
                 json->create_additions = RTEST(rb_hash_aref(opts, tmp));
@@ -1695,52 +1685,63 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             }
             tmp = ID2SYM(i_create_id);
             if (option_given_p(opts, tmp)) {
-                json->create_id = rb_hash_aref(opts, tmp);
+                PARSER_SET_REFERENCE(json, create_id, rb_hash_aref(opts, tmp));
             } else {
-                json->create_id = rb_funcall(mJSON, i_create_id, 0);
+                PARSER_SET_REFERENCE(json, create_id, rb_funcall(mJSON, i_create_id, 0));
             }
-            parser_iv_set(json, "@create_id", json->create_id);
             tmp = ID2SYM(i_object_class);
             if (option_given_p(opts, tmp)) {
-                json->object_class = rb_hash_aref(opts, tmp);
-                parser_iv_set(json, "@object_class", json->object_class);
+                PARSER_SET_REFERENCE(json, object_class, rb_hash_aref(opts, tmp));
+            } else {
+                PARSER_SET_REFERENCE(json, object_class, Qnil);
             }
             tmp = ID2SYM(i_array_class);
             if (option_given_p(opts, tmp)) {
-                json->array_class = rb_hash_aref(opts, tmp);
-                parser_iv_set(json, "@array_class", json->array_class);
+                PARSER_SET_REFERENCE(json, array_class, rb_hash_aref(opts, tmp));
+            } else {
+                PARSER_SET_REFERENCE(json, array_class, Qnil);
             }
             tmp = ID2SYM(i_match_string);
             if (option_given_p(opts, tmp)) {
                 VALUE match_string = rb_hash_aref(opts, tmp);
-                json->match_string = RTEST(match_string) ? match_string : Qnil;
-                parser_iv_set(json, "@match_string", json->match_string);
+                PARSER_SET_REFERENCE(json, match_string, RTEST(match_string) ? match_string : Qnil);
+            } else {
+                PARSER_SET_REFERENCE(json, match_string, Qnil);
             }
         }
     } else {
         json->max_nesting = 19;
         json->allow_nan = 0;
         json->create_additions = 1;
-        json->create_id = rb_funcall(mJSON, i_create_id, 0);
-        parser_iv_set(json, "@create_id", json->create_id);
+        PARSER_SET_REFERENCE(json, create_id, rb_funcall(mJSON, i_create_id, 0));
+        json->object_class = Qnil;
+        json->array_class = Qnil;
+    }
+    if (!json->quirks_mode) {
+      source = convert_encoding(StringValue(source));
     }
     json->current_nesting = 0;
-    json->len = len;
-    json->source = ptr;
-    json->Vsource = source;
-    parser_iv_set(json, "@vsource", json->Vsource);
+    json->len = RSTRING_LEN(source);
+    json->source = RSTRING_PTR(source);;
+    PARSER_SET_REFERENCE(json, Vsource, source);
     return self;
 }
 
-/*
- * call-seq: parse()
- *
- *  Parses the current JSON text _source_ and returns the complete data
- *  structure as a result.
- */
-static VALUE cParser_parse(VALUE self)
+
+#line 1729 "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;
+
+
+#line 736 "parser.rl"
+
+
+static VALUE cParser_parse_strict(VALUE self)
 {
-    const char *p, *pe;
+    char *p, *pe;
     int cs = EVIL;
     VALUE result = Qnil;
     GET_PARSER;
@@ -1751,7 +1752,7 @@ static VALUE cParser_parse(VALUE self)
 	cs = JSON_start;
 	}
 
-#line 745 "parser.rl"
+#line 746 "parser.rl"
     p = json->source;
     pe = p + json->len;
 
@@ -1811,18 +1812,18 @@ case 5:
 		goto st1;
 	goto st5;
 tr3:
-#line 540 "parser.rl"
+#line 725 "parser.rl"
 	{
-        const char *np;
+        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;
 tr4:
-#line 533 "parser.rl"
+#line 718 "parser.rl"
 	{
-        const char *np;
+        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;}
@@ -1889,7 +1890,7 @@ case 9:
 	_out: {}
 	}
 
-#line 748 "parser.rl"
+#line 749 "parser.rl"
 
     if (cs >= JSON_first_final && p == pe) {
         return result;
@@ -1899,6 +1900,197 @@ case 9:
     }
 }
 
+
+
+#line 1903 "parser.c"
+static const int JSON_quirks_mode_start = 1;
+static const int JSON_quirks_mode_first_final = 10;
+static const int JSON_quirks_mode_error = 0;
+
+static const int JSON_quirks_mode_en_main = 1;
+
+
+#line 774 "parser.rl"
+
+
+static VALUE cParser_parse_quirks_mode(VALUE self)
+{
+    char *p, *pe;
+    int cs = EVIL;
+    VALUE result = Qnil;
+    GET_PARSER;
+
+
+#line 1922 "parser.c"
+	{
+	cs = JSON_quirks_mode_start;
+	}
+
+#line 784 "parser.rl"
+    p = json->source;
+    pe = p + json->len;
+
+#line 1931 "parser.c"
+	{
+	if ( p == pe )
+		goto _test_eof;
+	switch ( cs )
+	{
+st1:
+	if ( ++p == pe )
+		goto _test_eof1;
+case 1:
+	switch( (*p) ) {
+		case 13: goto st1;
+		case 32: goto st1;
+		case 34: goto tr2;
+		case 45: goto tr2;
+		case 47: goto st6;
+		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 tr2;
+	} else if ( (*p) >= 9 )
+		goto st1;
+	goto st0;
+st0:
+cs = 0;
+	goto _out;
+tr2:
+#line 766 "parser.rl"
+	{
+        char *np = JSON_parse_value(json, p, pe, &result);
+        if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
+    }
+	goto st10;
+st10:
+	if ( ++p == pe )
+		goto _test_eof10;
+case 10:
+#line 1975 "parser.c"
+	switch( (*p) ) {
+		case 13: goto st10;
+		case 32: goto st10;
+		case 47: goto st2;
+	}
+	if ( 9 <= (*p) && (*p) <= 10 )
+		goto st10;
+	goto st0;
+st2:
+	if ( ++p == pe )
+		goto _test_eof2;
+case 2:
+	switch( (*p) ) {
+		case 42: goto st3;
+		case 47: goto st5;
+	}
+	goto st0;
+st3:
+	if ( ++p == pe )
+		goto _test_eof3;
+case 3:
+	if ( (*p) == 42 )
+		goto st4;
+	goto st3;
+st4:
+	if ( ++p == pe )
+		goto _test_eof4;
+case 4:
+	switch( (*p) ) {
+		case 42: goto st4;
+		case 47: goto st10;
+	}
+	goto st3;
+st5:
+	if ( ++p == pe )
+		goto _test_eof5;
+case 5:
+	if ( (*p) == 10 )
+		goto st10;
+	goto st5;
+st6:
+	if ( ++p == pe )
+		goto _test_eof6;
+case 6:
+	switch( (*p) ) {
+		case 42: goto st7;
+		case 47: goto st9;
+	}
+	goto st0;
+st7:
+	if ( ++p == pe )
+		goto _test_eof7;
+case 7:
+	if ( (*p) == 42 )
+		goto st8;
+	goto st7;
+st8:
+	if ( ++p == pe )
+		goto _test_eof8;
+case 8:
+	switch( (*p) ) {
+		case 42: goto st8;
+		case 47: goto st1;
+	}
+	goto st7;
+st9:
+	if ( ++p == pe )
+		goto _test_eof9;
+case 9:
+	if ( (*p) == 10 )
+		goto st1;
+	goto st9;
+	}
+	_test_eof1: cs = 1; goto _test_eof;
+	_test_eof10: cs = 10; 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_eof: {}
+	_out: {}
+	}
+
+#line 787 "parser.rl"
+
+    if (cs >= JSON_quirks_mode_first_final && p == pe) {
+        return result;
+    } else {
+        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        return Qnil;
+    }
+}
+
+/*
+ * call-seq: parse()
+ *
+ *  Parses the current JSON text _source_ and returns the complete data
+ *  structure as a result.
+ */
+static VALUE cParser_parse(VALUE self)
+{
+  GET_PARSER;
+
+  if (json->quirks_mode) {
+    return cParser_parse_quirks_mode(self);
+  } else {
+    return cParser_parse_strict(self);
+  }
+}
+
+
 static JSON_Parser *JSON_allocate()
 {
     JSON_Parser *json = ALLOC(JSON_Parser);
@@ -1913,7 +2105,14 @@ static JSON_Parser *JSON_allocate()
     return json;
 }
 
-/* deleted JSON_mark function */
+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);
+    rb_gc_mark_maybe(json->match_string);
+}
 
 static void JSON_free(JSON_Parser *json)
 {
@@ -1923,9 +2122,7 @@ static void JSON_free(JSON_Parser *json)
 static VALUE cJSON_parser_s_allocate(VALUE klass)
 {
     JSON_Parser *json = JSON_allocate();
-    VALUE data_obj = Data_Wrap_Struct(klass, NULL, JSON_free, json);
-    json->dwrapped_parser = data_obj;
-    return data_obj;
+    return json->dwrapped_parser = Data_Wrap_Struct(klass, JSON_mark, JSON_free, json);
 }
 
 /*
@@ -1940,6 +2137,18 @@ static VALUE cParser_source(VALUE self)
     return rb_str_dup(json->Vsource);
 }
 
+/*
+ * call-seq: quirks_mode?()
+ *
+ * Returns a true, if this parser is in quirks_mode, false otherwise.
+ */
+static VALUE cParser_quirks_mode_p(VALUE self)
+{
+    GET_PARSER;
+    return json->quirks_mode ? Qtrue : Qfalse;
+}
+
+
 void Init_parser()
 {
     rb_require("json/common");
@@ -1952,6 +2161,7 @@ void Init_parser()
     rb_define_method(cParser, "initialize", cParser_initialize, -1);
     rb_define_method(cParser, "parse", cParser_parse, 0);
     rb_define_method(cParser, "source", cParser_source, 0);
+    rb_define_method(cParser, "quirks_mode?", cParser_quirks_mode_p, 0);
 
     CNaN = rb_const_get(mJSON, rb_intern("NaN"));
     CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
@@ -1965,6 +2175,7 @@ void Init_parser()
     i_max_nesting = rb_intern("max_nesting");
     i_allow_nan = rb_intern("allow_nan");
     i_symbolize_names = rb_intern("symbolize_names");
+    i_quirks_mode = rb_intern("quirks_mode");
     i_object_class = rb_intern("object_class");
     i_array_class = rb_intern("array_class");
     i_match = rb_intern("match");