json 1.5.3 → 1.5.4

data/java/src/json/ext/GeneratorMethods.java

@@ -1,11 +1,12 @@
 /*
  * This code is copyrighted work by Daniel Luz <dev at mernen dot com>.
- * 
+ *
  * Distributed under the Ruby and GPLv2 licenses; see COPYING and GPL files
  * for details.
  */
 package json.ext;
 
+import java.lang.ref.WeakReference;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyBoolean;
@@ -24,7 +25,7 @@ import org.jruby.util.ByteList;
 /**
  * A class that populates the
  * <code>Json::Ext::Generator::GeneratorMethods</code> module.
- * 
+ *
  * @author mernen
  */
 class GeneratorMethods {
@@ -45,9 +46,9 @@ class GeneratorMethods {
         defineMethods(module, "String",     RbString.class);
         defineMethods(module, "TrueClass",  RbTrue.class);
 
-        info.stringExtendModule = module.defineModuleUnder("String")
-                                            .defineModuleUnder("Extend");
-        info.stringExtendModule.defineAnnotatedMethods(StringExtend.class);
+        info.stringExtendModule = new WeakReference<RubyModule>(module.defineModuleUnder("String")
+                                            .defineModuleUnder("Extend"));
+        info.stringExtendModule.get().defineAnnotatedMethods(StringExtend.class);
     }
 
     /**
@@ -140,7 +141,7 @@ class GeneratorMethods {
             RubyHash result = RubyHash.newHash(runtime);
 
             IRubyObject createId = RuntimeInfo.forRuntime(runtime)
-                    .jsonModule.callMethod(context, "create_id");
+                    .jsonModule.get().callMethod(context, "create_id");
             result.op_aset(context, createId, self.getMetaClass().to_s());
 
             ByteList bl = self.getByteList();
@@ -158,7 +159,7 @@ class GeneratorMethods {
         public static IRubyObject included(ThreadContext context,
                 IRubyObject vSelf, IRubyObject module) {
             RuntimeInfo info = RuntimeInfo.forRuntime(context.getRuntime());
-            return module.callMethod(context, "extend", info.stringExtendModule);
+            return module.callMethod(context, "extend", info.stringExtendModule.get());
         }
     }
 

data/java/src/json/ext/GeneratorService.java

@@ -1,12 +1,13 @@
 /*
  * This code is copyrighted work by Daniel Luz <dev at mernen dot com>.
- * 
+ *
  * Distributed under the Ruby and GPLv2 licenses; see COPYING and GPL files
  * for details.
  */
 package json.ext;
 
 import java.io.IOException;
+import java.lang.ref.WeakReference;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
@@ -23,15 +24,15 @@ public class GeneratorService implements BasicLibraryService {
         runtime.getLoadService().require("json/common");
         RuntimeInfo info = RuntimeInfo.initRuntime(runtime);
 
-        info.jsonModule = runtime.defineModule("JSON");
-        RubyModule jsonExtModule = info.jsonModule.defineModuleUnder("Ext");
+        info.jsonModule = new WeakReference<RubyModule>(runtime.defineModule("JSON"));
+        RubyModule jsonExtModule = info.jsonModule.get().defineModuleUnder("Ext");
         RubyModule generatorModule = jsonExtModule.defineModuleUnder("Generator");
 
         RubyClass stateClass =
             generatorModule.defineClassUnder("State", runtime.getObject(),
                                              GeneratorState.ALLOCATOR);
         stateClass.defineAnnotatedMethods(GeneratorState.class);
-        info.generatorStateClass = stateClass;
+        info.generatorStateClass = new WeakReference<RubyClass>(stateClass);
 
         RubyModule generatorMethods =
             generatorModule.defineModuleUnder("GeneratorMethods");

data/java/src/json/ext/GeneratorState.java

@@ -1,6 +1,6 @@
 /*
  * This code is copyrighted work by Daniel Luz <dev at mernen dot com>.
- * 
+ *
  * Distributed under the Ruby and GPLv2 licenses; see COPYING and GPL files
  * for details.
  */
@@ -24,10 +24,10 @@ import org.jruby.util.ByteList;
 
 /**
  * The <code>JSON::Ext::Generator::State</code> class.
- * 
+ *
  * <p>This class is used to create State instances, that are use to hold data
  * while generating a JSON text from a a Ruby data structure.
- * 
+ *
  * @author mernen
  */
 public class GeneratorState extends RubyObject {
@@ -72,10 +72,17 @@ public class GeneratorState extends RubyObject {
     private boolean allowNaN = DEFAULT_ALLOW_NAN;
     static final boolean DEFAULT_ALLOW_NAN = false;
     /**
-     * XXX
+     * If set to <code>true</code> all JSON documents generated do not contain
+     * any other characters than ASCII characters.
      */
     private boolean asciiOnly = DEFAULT_ASCII_ONLY;
     static final boolean DEFAULT_ASCII_ONLY = false;
+    /**
+     * If set to <code>true</code> all JSON values generated might not be
+     * RFC-conform JSON documents.
+     */
+    private boolean quirksMode = DEFAULT_QUIRKS_MODE;
+    static final boolean DEFAULT_QUIRKS_MODE = false;
 
     /**
      * The current depth (inside a #to_json call)
@@ -94,7 +101,7 @@ public class GeneratorState extends RubyObject {
 
     /**
      * <code>State.from_state(opts)</code>
-     * 
+     *
      * <p>Creates a State object from <code>opts</code>, which ought to be
      * {@link RubyHash Hash} to create a new <code>State</code> instance
      * configured by <codes>opts</code>, something else to create an
@@ -118,7 +125,7 @@ public class GeneratorState extends RubyObject {
 
     static GeneratorState fromState(ThreadContext context, RuntimeInfo info,
                                     IRubyObject opts) {
-        RubyClass klass = info.generatorStateClass;
+        RubyClass klass = info.generatorStateClass.get();
         if (opts != null) {
             // if the given parameter is a Generator::State, return itself
             if (klass.isInstance(opts)) return (GeneratorState)opts;
@@ -136,11 +143,11 @@ public class GeneratorState extends RubyObject {
 
     /**
      * <code>State#initialize(opts = {})</code>
-     * 
+     *
      * Instantiates a new <code>State</code> object, configured by <code>opts</code>.
-     * 
+     *
      * <code>opts</code> can have the following keys:
-     * 
+     *
      * <dl>
      * <dt><code>:indent</code>
      * <dd>a {@link RubyString String} used to indent levels (default: <code>""</code>)
@@ -151,7 +158,7 @@ public class GeneratorState extends RubyObject {
      * <dd>a String that is put before a <code>":"</code> pair delimiter
      * (default: <code>""</code>)
      * <dt><code>:object_nl</code>
-     * <dd>a String that is put at the end of a JSON object (default: <code>""</code>) 
+     * <dd>a String that is put at the end of a JSON object (default: <code>""</code>)
      * <dt><code>:array_nl</code>
      * <dd>a String that is put at the end of a JSON array (default: <code>""</code>)
      * <dt><code>:allow_nan</code>
@@ -181,17 +188,20 @@ public class GeneratorState extends RubyObject {
         this.maxNesting = orig.maxNesting;
         this.allowNaN = orig.allowNaN;
         this.asciiOnly = orig.asciiOnly;
+        this.quirksMode = orig.quirksMode;
         this.depth = orig.depth;
         return this;
     }
 
     /**
-     * XXX
+     * Generates a valid JSON document from object <code>obj</code> and returns
+     * the result. If no valid JSON document can be created this method raises
+     * a GeneratorError exception.
      */
     @JRubyMethod
     public IRubyObject generate(ThreadContext context, IRubyObject obj) {
         RubyString result = Generator.generateJson(context, obj, this);
-        if (!objectOrArrayLiteral(result)) {
+        if (!quirksMode && !objectOrArrayLiteral(result)) {
             throw Utils.newException(context, Utils.M_GENERATOR_ERROR,
                     "only generation of JSON objects or arrays allowed");
         }
@@ -364,6 +374,22 @@ public class GeneratorState extends RubyObject {
         return context.getRuntime().newBoolean(asciiOnly);
     }
 
+    @JRubyMethod(name="quirks_mode")
+    public RubyBoolean quirks_mode_get(ThreadContext context) {
+        return context.getRuntime().newBoolean(quirksMode);
+    }
+
+    @JRubyMethod(name="quirks_mode=")
+    public IRubyObject quirks_mode_set(IRubyObject quirks_mode) {
+        quirksMode = quirks_mode.isTrue();
+        return quirks_mode.getRuntime().newBoolean(quirksMode);
+    }
+
+    @JRubyMethod(name="quirks_mode?")
+    public RubyBoolean quirks_mode_p(ThreadContext context) {
+        return context.getRuntime().newBoolean(quirksMode);
+    }
+
     public int getDepth() {
         return depth;
     }
@@ -382,15 +408,15 @@ public class GeneratorState extends RubyObject {
     private ByteList prepareByteList(ThreadContext context, IRubyObject value) {
         RubyString str = value.convertToString();
         RuntimeInfo info = RuntimeInfo.forRuntime(context.getRuntime());
-        if (info.encodingsSupported() && str.encoding(context) != info.utf8) {
-            str = (RubyString)str.encode(context, info.utf8);
+        if (info.encodingsSupported() && str.encoding(context) != info.utf8.get()) {
+            str = (RubyString)str.encode(context, info.utf8.get());
         }
         return str.getByteList().dup();
     }
 
     /**
      * <code>State#configure(opts)</code>
-     * 
+     *
      * <p>Configures this State instance with the {@link RubyHash Hash}
      * <code>opts</code>, and returns itself.
      * @param vOpts The options hash
@@ -418,6 +444,7 @@ public class GeneratorState extends RubyObject {
         maxNesting = opts.getInt("max_nesting", DEFAULT_MAX_NESTING);
         allowNaN   = opts.getBool("allow_nan",  DEFAULT_ALLOW_NAN);
         asciiOnly  = opts.getBool("ascii_only", DEFAULT_ASCII_ONLY);
+        quirksMode = opts.getBool("quirks_mode", DEFAULT_QUIRKS_MODE);
 
         depth = opts.getInt("depth", 0);
 
@@ -426,7 +453,7 @@ public class GeneratorState extends RubyObject {
 
     /**
      * <code>State#to_h()</code>
-     * 
+     *
      * <p>Returns the configuration instance variables as a hash, that can be
      * passed to the configure method.
      * @return
@@ -443,6 +470,7 @@ public class GeneratorState extends RubyObject {
         result.op_aset(context, runtime.newSymbol("array_nl"), array_nl_get(context));
         result.op_aset(context, runtime.newSymbol("allow_nan"), allow_nan_p(context));
         result.op_aset(context, runtime.newSymbol("ascii_only"), ascii_only_p(context));
+        result.op_aset(context, runtime.newSymbol("quirks_mode"), quirks_mode_p(context));
         result.op_aset(context, runtime.newSymbol("max_nesting"), max_nesting_get(context));
         result.op_aset(context, runtime.newSymbol("depth"), depth_get(context));
         return result;

data/java/src/json/ext/OptionsReader.java

@@ -1,6 +1,6 @@
 /*
  * This code is copyrighted work by Daniel Luz <dev at mernen dot com>.
- * 
+ *
  * Distributed under the Ruby and GPLv2 licenses; see COPYING and GPL files
  * for details.
  */
@@ -84,8 +84,8 @@ final class OptionsReader {
 
         RubyString str = value.convertToString();
         RuntimeInfo info = getRuntimeInfo();
-        if (info.encodingsSupported() && str.encoding(context) != info.utf8) {
-            str = (RubyString)str.encode(context, info.utf8);
+        if (info.encodingsSupported() && str.encoding(context) != info.utf8.get()) {
+            str = (RubyString)str.encode(context, info.utf8.get());
         }
         return str;
     }

data/java/src/json/ext/Parser.java

@@ -2,7 +2,7 @@
 // line 1 "Parser.rl"
 /*
  * This code is copyrighted work by Daniel Luz <dev at mernen dot com>.
- * 
+ *
  * Distributed under the Ruby and GPLv2 licenses; see COPYING and GPL files
  * for details.
  */
@@ -31,16 +31,16 @@ import org.jruby.util.ByteList;
 
 /**
  * The <code>JSON::Ext::Parser</code> class.
- * 
+ *
  * <p>This is the JSON parser implemented as a Java class. To use it as the
  * standard parser, set
  *   <pre>JSON.parser = JSON::Ext::Parser</pre>
  * This is performed for you when you <code>include "json/ext"</code>.
- * 
+ *
  * <p>This class does not perform the actual parsing, just acts as an interface
  * to Ruby code. When the {@link #parse()} method is invoked, a
  * Parser.ParserSession object is instantiated, which handles the process.
- * 
+ *
  * @author mernen
  */
 public class Parser extends RubyObject {
@@ -51,6 +51,7 @@ public class Parser extends RubyObject {
     private int maxNesting;
     private boolean allowNaN;
     private boolean symbolizeNames;
+    private boolean quirksMode;
     private RubyClass objectClass;
     private RubyClass arrayClass;
     private RubyHash match_string;
@@ -71,7 +72,7 @@ public class Parser extends RubyObject {
 
     /**
      * Multiple-value return for internal parser methods.
-     * 
+     *
      * <p>All the <code>parse<var>Stuff</var></code> methods return instances of
      * <code>ParserResult</code> when successful, or <code>null</code> when
      * there's a problem with the input data.
@@ -100,18 +101,18 @@ public class Parser extends RubyObject {
 
     /**
      * <code>Parser.new(source, opts = {})</code>
-     * 
+     *
      * <p>Creates a new <code>JSON::Ext::Parser</code> instance for the string
      * <code>source</code>.
      * It will be configured by the <code>opts</code> Hash.
      * <code>opts</code> can have the following keys:
-     * 
+     *
      * <dl>
      * <dt><code>:max_nesting</code>
      * <dd>The maximum depth of nesting allowed in the parsed data
      * structures. Disable depth checking with <code>:max_nesting => false|nil|0</code>,
      * it defaults to 19.
-     * 
+     *
      * <dt><code>:allow_nan</code>
      * <dd>If set to <code>true</code>, allow <code>NaN</code>,
      * <code>Infinity</code> and <code>-Infinity</code> in defiance of RFC 4627
@@ -120,15 +121,19 @@ public class Parser extends RubyObject {
      * <dt><code>:symbolize_names</code>
      * <dd>If set to <code>true</code>, returns symbols for the names (keys) in
      * a JSON object. Otherwise strings are returned, which is also the default.
+     *
+     * <dt><code>:quirks_mode?</code>
+     * <dd>If set to <code>true</code>, if the parse is in quirks_mode, false
+     * otherwise.
      * 
      * <dt><code>:create_additions</code>
      * <dd>If set to <code>false</code>, the Parser doesn't create additions
      * even if a matchin class and <code>create_id</code> was found. This option
      * defaults to <code>true</code>.
-     * 
+     *
      * <dt><code>:object_class</code>
      * <dd>Defaults to Hash.
-     * 
+     *
      * <dt><code>:array_class</code>
      * <dd>Defaults to Array.
      * </dl>
@@ -144,20 +149,25 @@ public class Parser extends RubyObject {
 
     @JRubyMethod(required = 1, optional = 1, visibility = Visibility.PRIVATE)
     public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
-        Ruby runtime      = context.getRuntime();
-        RubyString source = convertEncoding(context, args[0].convertToString());
+        Ruby runtime = context.getRuntime();
+        if (this.vSource != null) {
+            throw runtime.newTypeError("already initialized instance");
+         }
 
         OptionsReader opts   = new OptionsReader(context, args.length > 1 ? args[1] : null);
         this.maxNesting      = opts.getInt("max_nesting", DEFAULT_MAX_NESTING);
         this.allowNaN        = opts.getBool("allow_nan", false);
         this.symbolizeNames  = opts.getBool("symbolize_names", false);
+        this.quirksMode      = opts.getBool("quirks_mode", false);
         this.createId        = opts.getString("create_id", getCreateId(context));
         this.createAdditions = opts.getBool("create_additions", true);
         this.objectClass     = opts.getClass("object_class", runtime.getHash());
         this.arrayClass      = opts.getClass("array_class", runtime.getArray());
         this.match_string    = opts.getHash("match_string");
 
-        this.vSource = source;
+        this.vSource = args[0].convertToString();
+        if (!quirksMode) this.vSource = convertEncoding(context, vSource);
+
         return this;
     }
 
@@ -176,8 +186,8 @@ public class Parser extends RubyObject {
 
         if (info.encodingsSupported()) {
             RubyEncoding encoding = (RubyEncoding)source.encoding(context);
-            if (encoding != info.ascii8bit) {
-                return (RubyString)source.encode(context, info.utf8);
+            if (encoding != info.ascii8bit.get()) {
+                return (RubyString)source.encode(context, info.utf8.get());
             }
 
             String sniffedEncoding = sniffByteList(bl);
@@ -188,7 +198,7 @@ public class Parser extends RubyObject {
         String sniffedEncoding = sniffByteList(bl);
         if (sniffedEncoding == null) return source; // assume UTF-8
         Ruby runtime = context.getRuntime();
-        return (RubyString)info.jsonModule.
+        return (RubyString)info.jsonModule.get().
             callMethod(context, "iconv",
                 new IRubyObject[] {
                     runtime.newString("utf-8"),
@@ -218,7 +228,7 @@ public class Parser extends RubyObject {
     private RubyString reinterpretEncoding(ThreadContext context,
             RubyString str, String sniffedEncoding) {
         RubyEncoding actualEncoding = info.getEncoding(context, sniffedEncoding);
-        RubyEncoding targetEncoding = info.utf8;
+        RubyEncoding targetEncoding = info.utf8.get();
         RubyString dup = (RubyString)str.dup();
         dup.force_encoding(context, actualEncoding);
         return (RubyString)dup.encode_bang(context, targetEncoding);
@@ -226,7 +236,7 @@ public class Parser extends RubyObject {
 
     /**
      * <code>Parser#parse()</code>
-     * 
+     *
      * <p>Parses the current JSON text <code>source</code> and returns the
      * complete data structure as a result.
      */
@@ -237,13 +247,32 @@ public class Parser extends RubyObject {
 
     /**
      * <code>Parser#source()</code>
-     * 
+     *
      * <p>Returns a copy of the current <code>source</code> string, that was
      * used to construct this Parser.
      */
     @JRubyMethod(name = "source")
     public IRubyObject source_get() {
-        return vSource.dup();
+        return checkAndGetSource().dup();
+    }
+
+    /**
+     * <code>Parser#quirks_mode?()</code>
+     * 
+     * <p>If set to <code>true</code>, if the parse is in quirks_mode, false
+     * otherwise.
+     */
+    @JRubyMethod(name = "quirks_mode?")
+    public IRubyObject quirks_mode_p(ThreadContext context) {
+        return context.getRuntime().newBoolean(quirksMode);
+    }
+
+    public RubyString checkAndGetSource() {
+      if (vSource != null) {
+        return vSource;
+      } else {
+        throw getRuntime().newTypeError("uninitialized instance");
+      }
     }
 
     /**
@@ -251,13 +280,13 @@ public class Parser extends RubyObject {
      * set to <code>nil</code> or <code>false</code>, and a String if not.
      */
     private RubyString getCreateId(ThreadContext context) {
-        IRubyObject v = info.jsonModule.callMethod(context, "create_id");
+        IRubyObject v = info.jsonModule.get().callMethod(context, "create_id");
         return v.isTrue() ? v.convertToString() : null;
     }
 
     /**
      * A string parsing session.
-     * 
+     *
      * <p>Once a ParserSession is instantiated, the source string should not
      * change until the parsing is complete. The ParserSession object assumes
      * the source {@link RubyString} is still associated to its original
@@ -281,7 +310,7 @@ public class Parser extends RubyObject {
         private ParserSession(Parser parser, ThreadContext context) {
             this.parser = parser;
             this.context = context;
-            this.byteList = parser.vSource.getByteList();
+            this.byteList = parser.checkAndGetSource().getByteList();
             this.data = byteList.unsafeBytes();
             this.decoder = new StringDecoder(context);
         }
@@ -298,11 +327,11 @@ public class Parser extends RubyObject {
         }
 
         
-// line 324 "Parser.rl"
+// line 353 "Parser.rl"
 
 
         
-// line 306 "Parser.java"
+// line 335 "Parser.java"
 private static byte[] init__JSON_value_actions_0()
 {
 	return new byte [] {
@@ -416,7 +445,7 @@ static final int JSON_value_error = 0;
 static final int JSON_value_en_main = 1;
 
 
-// line 430 "Parser.rl"
+// line 459 "Parser.rl"
 
 
         ParserResult parseValue(int p, int pe) {
@@ -424,14 +453,14 @@ static final int JSON_value_en_main = 1;
             IRubyObject result = null;
 
             
-// line 428 "Parser.java"
+// line 457 "Parser.java"
 	{
 	cs = JSON_value_start;
 	}
 
-// line 437 "Parser.rl"
+// line 466 "Parser.rl"
             
-// line 435 "Parser.java"
+// line 464 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -457,13 +486,13 @@ case 1:
 	while ( _nacts-- > 0 ) {
 		switch ( _JSON_value_actions[_acts++] ) {
 	case 9:
-// line 415 "Parser.rl"
+// line 444 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 467 "Parser.java"
+// line 496 "Parser.java"
 		}
 	}
 
@@ -526,25 +555,25 @@ case 1:
 			switch ( _JSON_value_actions[_acts++] )
 			{
 	case 0:
-// line 332 "Parser.rl"
+// line 361 "Parser.rl"
 	{
                 result = getRuntime().getNil();
             }
 	break;
 	case 1:
-// line 335 "Parser.rl"
+// line 364 "Parser.rl"
 	{
                 result = getRuntime().getFalse();
             }
 	break;
 	case 2:
-// line 338 "Parser.rl"
+// line 367 "Parser.rl"
 	{
                 result = getRuntime().getTrue();
             }
 	break;
 	case 3:
-// line 341 "Parser.rl"
+// line 370 "Parser.rl"
 	{
                 if (parser.allowNaN) {
                     result = getConstant(CONST_NAN);
@@ -554,7 +583,7 @@ case 1:
             }
 	break;
 	case 4:
-// line 348 "Parser.rl"
+// line 377 "Parser.rl"
 	{
                 if (parser.allowNaN) {
                     result = getConstant(CONST_INFINITY);
@@ -564,9 +593,9 @@ case 1:
             }
 	break;
 	case 5:
-// line 355 "Parser.rl"
+// line 384 "Parser.rl"
 	{
-                if (pe > p + 9 &&
+                if (pe > p + 9 - (parser.quirksMode ? 1 : 0) &&
                     absSubSequence(p, p + 9).toString().equals(JSON_MINUS_INFINITY)) {
 
                     if (parser.allowNaN) {
@@ -593,7 +622,7 @@ case 1:
             }
 	break;
 	case 6:
-// line 381 "Parser.rl"
+// line 410 "Parser.rl"
 	{
                 ParserResult res = parseString(p, pe);
                 if (res == null) {
@@ -606,7 +635,7 @@ case 1:
             }
 	break;
 	case 7:
-// line 391 "Parser.rl"
+// line 420 "Parser.rl"
 	{
                 currentNesting++;
                 ParserResult res = parseArray(p, pe);
@@ -621,7 +650,7 @@ case 1:
             }
 	break;
 	case 8:
-// line 403 "Parser.rl"
+// line 432 "Parser.rl"
 	{
                 currentNesting++;
                 ParserResult res = parseObject(p, pe);
@@ -635,7 +664,7 @@ case 1:
                 }
             }
 	break;
-// line 639 "Parser.java"
+// line 668 "Parser.java"
 			}
 		}
 	}
@@ -655,7 +684,7 @@ case 5:
 	break; }
 	}
 
-// line 438 "Parser.rl"
+// line 467 "Parser.rl"
 
             if (cs >= JSON_value_first_final && result != null) {
                 return new ParserResult(result, p);
@@ -665,7 +694,7 @@ case 5:
         }
 
         
-// line 669 "Parser.java"
+// line 698 "Parser.java"
 private static byte[] init__JSON_integer_actions_0()
 {
 	return new byte [] {
@@ -679,7 +708,7 @@ private static final byte _JSON_integer_actions[] = init__JSON_integer_actions_0
 private static byte[] init__JSON_integer_key_offsets_0()
 {
 	return new byte [] {
-	    0,    0,    4,    7,    9,   11
+	    0,    0,    4,    7,    9,    9
 	};
 }
 
@@ -709,7 +738,7 @@ private static final byte _JSON_integer_single_lengths[] = init__JSON_integer_si
 private static byte[] init__JSON_integer_range_lengths_0()
 {
 	return new byte [] {
-	    0,    1,    1,    1,    1,    0
+	    0,    1,    1,    1,    0,    1
 	};
 }
 
@@ -719,7 +748,7 @@ private static final byte _JSON_integer_range_lengths[] = init__JSON_integer_ran
 private static byte[] init__JSON_integer_index_offsets_0()
 {
 	return new byte [] {
-	    0,    0,    4,    7,    9,   11
+	    0,    0,    4,    7,    9,   10
 	};
 }
 
@@ -729,7 +758,7 @@ private static final byte _JSON_integer_index_offsets[] = init__JSON_integer_ind
 private static byte[] init__JSON_integer_indicies_0()
 {
 	return new byte [] {
-	    0,    2,    3,    1,    2,    3,    1,    1,    4,    3,    4,    1,
+	    0,    2,    3,    1,    2,    3,    1,    1,    4,    1,    3,    4,
 	    0
 	};
 }
@@ -740,7 +769,7 @@ private static final byte _JSON_integer_indicies[] = init__JSON_integer_indicies
 private static byte[] init__JSON_integer_trans_targs_0()
 {
 	return new byte [] {
-	    2,    0,    3,    4,    5
+	    2,    0,    3,    5,    4
 	};
 }
 
@@ -758,28 +787,28 @@ private static final byte _JSON_integer_trans_actions[] = init__JSON_integer_tra
 
 
 static final int JSON_integer_start = 1;
-static final int JSON_integer_first_final = 5;
+static final int JSON_integer_first_final = 3;
 static final int JSON_integer_error = 0;
 
 static final int JSON_integer_en_main = 1;
 
 
-// line 457 "Parser.rl"
+// line 486 "Parser.rl"
 
 
         ParserResult parseInteger(int p, int pe) {
             int cs = EVIL;
 
             
-// line 775 "Parser.java"
+// line 804 "Parser.java"
 	{
 	cs = JSON_integer_start;
 	}
 
-// line 463 "Parser.rl"
+// line 492 "Parser.rl"
             int memo = p;
             
-// line 783 "Parser.java"
+// line 812 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -860,13 +889,13 @@ case 1:
 			switch ( _JSON_integer_actions[_acts++] )
 			{
 	case 0:
-// line 451 "Parser.rl"
+// line 480 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 870 "Parser.java"
+// line 899 "Parser.java"
 			}
 		}
 	}
@@ -886,7 +915,7 @@ case 5:
 	break; }
 	}
 
-// line 465 "Parser.rl"
+// line 494 "Parser.rl"
 
             if (cs < JSON_integer_first_final) {
                 return null;
@@ -901,7 +930,7 @@ case 5:
         }
 
         
-// line 905 "Parser.java"
+// line 934 "Parser.java"
 private static byte[] init__JSON_float_actions_0()
 {
 	return new byte [] {
@@ -915,7 +944,7 @@ private static final byte _JSON_float_actions[] = init__JSON_float_actions_0();
 private static byte[] init__JSON_float_key_offsets_0()
 {
 	return new byte [] {
-	    0,    0,    4,    7,   10,   12,   18,   22,   24,   30,   35
+	    0,    0,    4,    7,   10,   12,   16,   18,   23,   29,   29
 	};
 }
 
@@ -926,8 +955,8 @@ private static char[] init__JSON_float_trans_keys_0()
 {
 	return new char [] {
 	   45,   48,   49,   57,   48,   49,   57,   46,   69,  101,   48,   57,
-	   69,  101,   45,   46,   48,   57,   43,   45,   48,   57,   48,   57,
-	   69,  101,   45,   46,   48,   57,   46,   69,  101,   48,   57,    0
+	   43,   45,   48,   57,   48,   57,   46,   69,  101,   48,   57,   69,
+	  101,   45,   46,   48,   57,   69,  101,   45,   46,   48,   57,    0
 	};
 }
 
@@ -937,7 +966,7 @@ private static final char _JSON_float_trans_keys[] = init__JSON_float_trans_keys
 private static byte[] init__JSON_float_single_lengths_0()
 {
 	return new byte [] {
-	    0,    2,    1,    3,    0,    2,    2,    0,    2,    3,    0
+	    0,    2,    1,    3,    0,    2,    0,    3,    2,    0,    2
 	};
 }
 
@@ -947,7 +976,7 @@ private static final byte _JSON_float_single_lengths[] = init__JSON_float_single
 private static byte[] init__JSON_float_range_lengths_0()
 {
 	return new byte [] {
-	    0,    1,    1,    0,    1,    2,    1,    1,    2,    1,    0
+	    0,    1,    1,    0,    1,    1,    1,    1,    2,    0,    2
 	};
 }
 
@@ -957,7 +986,7 @@ private static final byte _JSON_float_range_lengths[] = init__JSON_float_range_l
 private static byte[] init__JSON_float_index_offsets_0()
 {
 	return new byte [] {
-	    0,    0,    4,    7,   11,   13,   18,   22,   24,   29,   34
+	    0,    0,    4,    7,   11,   13,   17,   19,   24,   29,   30
 	};
 }
 
@@ -968,8 +997,8 @@ private static byte[] init__JSON_float_indicies_0()
 {
 	return new byte [] {
 	    0,    2,    3,    1,    2,    3,    1,    4,    5,    5,    1,    6,
-	    1,    5,    5,    1,    6,    7,    8,    8,    9,    1,    9,    1,
-	    1,    1,    1,    9,    7,    4,    5,    5,    3,    1,    1,    0
+	    1,    7,    7,    8,    1,    8,    1,    4,    5,    5,    3,    1,
+	    5,    5,    1,    6,    9,    1,    1,    1,    1,    8,    9,    0
 	};
 }
 
@@ -979,7 +1008,7 @@ private static final byte _JSON_float_indicies[] = init__JSON_float_indicies_0()
 private static byte[] init__JSON_float_trans_targs_0()
 {
 	return new byte [] {
-	    2,    0,    3,    9,    4,    6,    5,   10,    7,    8
+	    2,    0,    3,    7,    4,    5,    8,    6,   10,    9
 	};
 }
 
@@ -989,7 +1018,7 @@ private static final byte _JSON_float_trans_targs[] = init__JSON_float_trans_tar
 private static byte[] init__JSON_float_trans_actions_0()
 {
 	return new byte [] {
-	    0,    0,    0,    0,    0,    0,    0,    1,    0,    0
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    1
 	};
 }
 
@@ -997,28 +1026,28 @@ private static final byte _JSON_float_trans_actions[] = init__JSON_float_trans_a
 
 
 static final int JSON_float_start = 1;
-static final int JSON_float_first_final = 10;
+static final int JSON_float_first_final = 8;
 static final int JSON_float_error = 0;
 
 static final int JSON_float_en_main = 1;
 
 
-// line 493 "Parser.rl"
+// line 522 "Parser.rl"
 
 
         ParserResult parseFloat(int p, int pe) {
             int cs = EVIL;
 
             
-// line 1014 "Parser.java"
+// line 1043 "Parser.java"
 	{
 	cs = JSON_float_start;
 	}
 
-// line 499 "Parser.rl"
+// line 528 "Parser.rl"
             int memo = p;
             
-// line 1022 "Parser.java"
+// line 1051 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1099,13 +1128,13 @@ case 1:
 			switch ( _JSON_float_actions[_acts++] )
 			{
 	case 0:
-// line 484 "Parser.rl"
+// line 513 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1109 "Parser.java"
+// line 1138 "Parser.java"
 			}
 		}
 	}
@@ -1125,7 +1154,7 @@ case 5:
 	break; }
 	}
 
-// line 501 "Parser.rl"
+// line 530 "Parser.rl"
 
             if (cs < JSON_float_first_final) {
                 return null;
@@ -1140,7 +1169,7 @@ case 5:
         }
 
         
-// line 1144 "Parser.java"
+// line 1173 "Parser.java"
 private static byte[] init__JSON_string_actions_0()
 {
 	return new byte [] {
@@ -1242,7 +1271,7 @@ static final int JSON_string_error = 0;
 static final int JSON_string_en_main = 1;
 
 
-// line 545 "Parser.rl"
+// line 574 "Parser.rl"
 
 
         ParserResult parseString(int p, int pe) {
@@ -1250,15 +1279,15 @@ static final int JSON_string_en_main = 1;
             IRubyObject result = null;
 
             
-// line 1254 "Parser.java"
+// line 1283 "Parser.java"
 	{
 	cs = JSON_string_start;
 	}
 
-// line 552 "Parser.rl"
+// line 581 "Parser.rl"
             int memo = p;
             
-// line 1262 "Parser.java"
+// line 1291 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1339,7 +1368,7 @@ case 1:
 			switch ( _JSON_string_actions[_acts++] )
 			{
 	case 0:
-// line 520 "Parser.rl"
+// line 549 "Parser.rl"
 	{
                 int offset = byteList.begin();
                 ByteList decoded = decoder.decode(byteList, memo + 1 - offset,
@@ -1354,13 +1383,13 @@ case 1:
             }
 	break;
 	case 1:
-// line 533 "Parser.rl"
+// line 562 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1364 "Parser.java"
+// line 1393 "Parser.java"
 			}
 		}
 	}
@@ -1380,7 +1409,7 @@ case 5:
 	break; }
 	}
 
-// line 554 "Parser.rl"
+// line 583 "Parser.rl"
 
             if (parser.createAdditions) {
                 RubyHash match_string = parser.match_string;
@@ -1397,7 +1426,7 @@ case 5:
                           }
                       });
                     } catch (JumpException e) { }
-                    if (memoArray[1] != null) { 
+                    if (memoArray[1] != null) {
                         RubyClass klass = (RubyClass) memoArray[1];
                         if (klass.respondsTo("json_creatable?") &&
                             klass.callMethod(context, "json_creatable?").isTrue()) {
@@ -1415,7 +1444,7 @@ case 5:
         }
 
         
-// line 1419 "Parser.java"
+// line 1448 "Parser.java"
 private static byte[] init__JSON_array_actions_0()
 {
 	return new byte [] {
@@ -1528,7 +1557,7 @@ static final int JSON_array_error = 0;
 static final int JSON_array_en_main = 1;
 
 
-// line 624 "Parser.rl"
+// line 653 "Parser.rl"
 
 
         ParserResult parseArray(int p, int pe) {
@@ -1546,14 +1575,14 @@ static final int JSON_array_en_main = 1;
                     IRubyObject.NULL_ARRAY, Block.NULL_BLOCK);
 
             
-// line 1550 "Parser.java"
+// line 1579 "Parser.java"
 	{
 	cs = JSON_array_start;
 	}
 
-// line 641 "Parser.rl"
+// line 670 "Parser.rl"
             
-// line 1557 "Parser.java"
+// line 1586 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1634,7 +1663,7 @@ case 1:
 			switch ( _JSON_array_actions[_acts++] )
 			{
 	case 0:
-// line 593 "Parser.rl"
+// line 622 "Parser.rl"
 	{
                 ParserResult res = parseValue(p, pe);
                 if (res == null) {
@@ -1651,13 +1680,13 @@ case 1:
             }
 	break;
 	case 1:
-// line 608 "Parser.rl"
+// line 637 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1661 "Parser.java"
+// line 1690 "Parser.java"
 			}
 		}
 	}
@@ -1677,7 +1706,7 @@ case 5:
 	break; }
 	}
 
-// line 642 "Parser.rl"
+// line 671 "Parser.rl"
 
             if (cs >= JSON_array_first_final) {
                 return new ParserResult(result, p + 1);
@@ -1687,7 +1716,7 @@ case 5:
         }
 
         
-// line 1691 "Parser.java"
+// line 1720 "Parser.java"
 private static byte[] init__JSON_object_actions_0()
 {
 	return new byte [] {
@@ -1810,7 +1839,7 @@ static final int JSON_object_error = 0;
 static final int JSON_object_en_main = 1;
 
 
-// line 702 "Parser.rl"
+// line 730 "Parser.rl"
 
 
         ParserResult parseObject(int p, int pe) {
@@ -1829,14 +1858,14 @@ static final int JSON_object_en_main = 1;
                     IRubyObject.NULL_ARRAY, Block.NULL_BLOCK);
 
             
-// line 1833 "Parser.java"
+// line 1862 "Parser.java"
 	{
 	cs = JSON_object_start;
 	}
 
-// line 720 "Parser.rl"
+// line 748 "Parser.rl"
             
-// line 1840 "Parser.java"
+// line 1869 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1917,7 +1946,7 @@ case 1:
 			switch ( _JSON_object_actions[_acts++] )
 			{
 	case 0:
-// line 656 "Parser.rl"
+// line 685 "Parser.rl"
 	{
                 ParserResult res = parseValue(p, pe);
                 if (res == null) {
@@ -1934,7 +1963,7 @@ case 1:
             }
 	break;
 	case 1:
-// line 671 "Parser.rl"
+// line 700 "Parser.rl"
 	{
                 ParserResult res = parseString(p, pe);
                 if (res == null) {
@@ -1954,13 +1983,13 @@ case 1:
             }
 	break;
 	case 2:
-// line 689 "Parser.rl"
+// line 718 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1964 "Parser.java"
+// line 1993 "Parser.java"
 			}
 		}
 	}
@@ -1980,7 +2009,7 @@ case 5:
 	break; }
 	}
 
-// line 721 "Parser.rl"
+// line 749 "Parser.rl"
 
             if (cs < JSON_object_first_final) {
                 return null;
@@ -1993,7 +2022,7 @@ case 5:
                 IRubyObject vKlassName = result.op_aref(context, parser.createId);
                 if (!vKlassName.isNil()) {
                     // might throw ArgumentError, we let it propagate
-                    IRubyObject klass = parser.info.jsonModule.
+                    IRubyObject klass = parser.info.jsonModule.get().
                             callMethod(context, "deep_const_get", vKlassName);
                     if (klass.respondsTo("json_creatable?") &&
                         klass.callMethod(context, "json_creatable?").isTrue()) {
@@ -2006,7 +2035,7 @@ case 5:
         }
 
         
-// line 2010 "Parser.java"
+// line 2039 "Parser.java"
 private static byte[] init__JSON_actions_0()
 {
 	return new byte [] {
@@ -2110,25 +2139,25 @@ static final int JSON_error = 0;
 static final int JSON_en_main = 1;
 
 
-// line 779 "Parser.rl"
+// line 807 "Parser.rl"
 
 
-        public IRubyObject parse() {
+        public IRubyObject parseStrict() {
             int cs = EVIL;
             int p, pe;
             IRubyObject result = null;
 
             
-// line 2123 "Parser.java"
+// line 2152 "Parser.java"
 	{
 	cs = JSON_start;
 	}
 
-// line 787 "Parser.rl"
+// line 815 "Parser.rl"
             p = byteList.begin();
             pe = p + byteList.length();
             
-// line 2132 "Parser.java"
+// line 2161 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -2209,7 +2238,7 @@ case 1:
 			switch ( _JSON_actions[_acts++] )
 			{
 	case 0:
-// line 751 "Parser.rl"
+// line 779 "Parser.rl"
 	{
                 currentNesting = 1;
                 ParserResult res = parseObject(p, pe);
@@ -2223,7 +2252,7 @@ case 1:
             }
 	break;
 	case 1:
-// line 763 "Parser.rl"
+// line 791 "Parser.rl"
 	{
                 currentNesting = 1;
                 ParserResult res = parseArray(p, pe);
@@ -2236,7 +2265,7 @@ case 1:
                 }
             }
 	break;
-// line 2240 "Parser.java"
+// line 2269 "Parser.java"
 			}
 		}
 	}
@@ -2256,7 +2285,7 @@ case 5:
 	break; }
 	}
 
-// line 790 "Parser.rl"
+// line 818 "Parser.rl"
 
             if (cs >= JSON_first_final && p == pe) {
                 return result;
@@ -2265,6 +2294,259 @@ case 5:
             }
         }
 
+        
+// line 2299 "Parser.java"
+private static byte[] init__JSON_quirks_mode_actions_0()
+{
+	return new byte [] {
+	    0,    1,    0
+	};
+}
+
+private static final byte _JSON_quirks_mode_actions[] = init__JSON_quirks_mode_actions_0();
+
+
+private static byte[] init__JSON_quirks_mode_key_offsets_0()
+{
+	return new byte [] {
+	    0,    0,   16,   18,   19,   21,   22,   24,   25,   27,   28
+	};
+}
+
+private static final byte _JSON_quirks_mode_key_offsets[] = init__JSON_quirks_mode_key_offsets_0();
+
+
+private static char[] init__JSON_quirks_mode_trans_keys_0()
+{
+	return new char [] {
+	   13,   32,   34,   45,   47,   73,   78,   91,  102,  110,  116,  123,
+	    9,   10,   48,   57,   42,   47,   42,   42,   47,   10,   42,   47,
+	   42,   42,   47,   10,   13,   32,   47,    9,   10,    0
+	};
+}
+
+private static final char _JSON_quirks_mode_trans_keys[] = init__JSON_quirks_mode_trans_keys_0();
+
+
+private static byte[] init__JSON_quirks_mode_single_lengths_0()
+{
+	return new byte [] {
+	    0,   12,    2,    1,    2,    1,    2,    1,    2,    1,    3
+	};
+}
+
+private static final byte _JSON_quirks_mode_single_lengths[] = init__JSON_quirks_mode_single_lengths_0();
+
+
+private static byte[] init__JSON_quirks_mode_range_lengths_0()
+{
+	return new byte [] {
+	    0,    2,    0,    0,    0,    0,    0,    0,    0,    0,    1
+	};
+}
+
+private static final byte _JSON_quirks_mode_range_lengths[] = init__JSON_quirks_mode_range_lengths_0();
+
+
+private static byte[] init__JSON_quirks_mode_index_offsets_0()
+{
+	return new byte [] {
+	    0,    0,   15,   18,   20,   23,   25,   28,   30,   33,   35
+	};
+}
+
+private static final byte _JSON_quirks_mode_index_offsets[] = init__JSON_quirks_mode_index_offsets_0();
+
+
+private static byte[] init__JSON_quirks_mode_indicies_0()
+{
+	return new byte [] {
+	    0,    0,    2,    2,    3,    2,    2,    2,    2,    2,    2,    2,
+	    0,    2,    1,    4,    5,    1,    6,    4,    6,    7,    4,    7,
+	    5,    8,    9,    1,   10,    8,   10,    0,    8,    0,    9,    7,
+	    7,   11,    7,    1,    0
+	};
+}
+
+private static final byte _JSON_quirks_mode_indicies[] = init__JSON_quirks_mode_indicies_0();
+
+
+private static byte[] init__JSON_quirks_mode_trans_targs_0()
+{
+	return new byte [] {
+	    1,    0,   10,    6,    3,    5,    4,   10,    7,    9,    8,    2
+	};
+}
+
+private static final byte _JSON_quirks_mode_trans_targs[] = init__JSON_quirks_mode_trans_targs_0();
+
+
+private static byte[] init__JSON_quirks_mode_trans_actions_0()
+{
+	return new byte [] {
+	    0,    0,    1,    0,    0,    0,    0,    0,    0,    0,    0,    0
+	};
+}
+
+private static final byte _JSON_quirks_mode_trans_actions[] = init__JSON_quirks_mode_trans_actions_0();
+
+
+static final int JSON_quirks_mode_start = 1;
+static final int JSON_quirks_mode_first_final = 10;
+static final int JSON_quirks_mode_error = 0;
+
+static final int JSON_quirks_mode_en_main = 1;
+
+
+// line 846 "Parser.rl"
+
+
+        public IRubyObject parseQuirksMode() {
+            int cs = EVIL;
+            int p, pe;
+            IRubyObject result = null;
+
+            
+// line 2411 "Parser.java"
+	{
+	cs = JSON_quirks_mode_start;
+	}
+
+// line 854 "Parser.rl"
+            p = byteList.begin();
+            pe = p + byteList.length();
+            
+// line 2420 "Parser.java"
+	{
+	int _klen;
+	int _trans = 0;
+	int _acts;
+	int _nacts;
+	int _keys;
+	int _goto_targ = 0;
+
+	_goto: while (true) {
+	switch ( _goto_targ ) {
+	case 0:
+	if ( p == pe ) {
+		_goto_targ = 4;
+		continue _goto;
+	}
+	if ( cs == 0 ) {
+		_goto_targ = 5;
+		continue _goto;
+	}
+case 1:
+	_match: do {
+	_keys = _JSON_quirks_mode_key_offsets[cs];
+	_trans = _JSON_quirks_mode_index_offsets[cs];
+	_klen = _JSON_quirks_mode_single_lengths[cs];
+	if ( _klen > 0 ) {
+		int _lower = _keys;
+		int _mid;
+		int _upper = _keys + _klen - 1;
+		while (true) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + ((_upper-_lower) >> 1);
+			if ( data[p] < _JSON_quirks_mode_trans_keys[_mid] )
+				_upper = _mid - 1;
+			else if ( data[p] > _JSON_quirks_mode_trans_keys[_mid] )
+				_lower = _mid + 1;
+			else {
+				_trans += (_mid - _keys);
+				break _match;
+			}
+		}
+		_keys += _klen;
+		_trans += _klen;
+	}
+
+	_klen = _JSON_quirks_mode_range_lengths[cs];
+	if ( _klen > 0 ) {
+		int _lower = _keys;
+		int _mid;
+		int _upper = _keys + (_klen<<1) - 2;
+		while (true) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + (((_upper-_lower) >> 1) & ~1);
+			if ( data[p] < _JSON_quirks_mode_trans_keys[_mid] )
+				_upper = _mid - 2;
+			else if ( data[p] > _JSON_quirks_mode_trans_keys[_mid+1] )
+				_lower = _mid + 2;
+			else {
+				_trans += ((_mid - _keys)>>1);
+				break _match;
+			}
+		}
+		_trans += _klen;
+	}
+	} while (false);
+
+	_trans = _JSON_quirks_mode_indicies[_trans];
+	cs = _JSON_quirks_mode_trans_targs[_trans];
+
+	if ( _JSON_quirks_mode_trans_actions[_trans] != 0 ) {
+		_acts = _JSON_quirks_mode_trans_actions[_trans];
+		_nacts = (int) _JSON_quirks_mode_actions[_acts++];
+		while ( _nacts-- > 0 )
+	{
+			switch ( _JSON_quirks_mode_actions[_acts++] )
+			{
+	case 0:
+// line 832 "Parser.rl"
+	{
+                ParserResult res = parseValue(p, pe);
+                if (res == null) {
+                    p--;
+                    { p += 1; _goto_targ = 5; if (true)  continue _goto;}
+                } else {
+                    result = res.result;
+                    {p = (( res.p))-1;}
+                }
+            }
+	break;
+// line 2513 "Parser.java"
+			}
+		}
+	}
+
+case 2:
+	if ( cs == 0 ) {
+		_goto_targ = 5;
+		continue _goto;
+	}
+	if ( ++p != pe ) {
+		_goto_targ = 1;
+		continue _goto;
+	}
+case 4:
+case 5:
+	}
+	break; }
+	}
+
+// line 857 "Parser.rl"
+
+            if (cs >= JSON_quirks_mode_first_final && p == pe) {
+                return result;
+            } else {
+                throw unexpectedToken(p, pe);
+            }
+        }
+
+        public IRubyObject parse() {
+          if (parser.quirksMode) {
+            return parseQuirksMode();
+          } else {
+            return parseStrict();
+          }
+
+        }
+
         /**
          * Returns a subsequence of the source ByteList, based on source
          * array byte offsets (i.e., the ByteList's own begin offset is not
@@ -2283,7 +2565,7 @@ case 5:
          * @param name The constant name
          */
         private IRubyObject getConstant(String name) {
-            return parser.info.jsonModule.getConstant(name);
+            return parser.info.jsonModule.get().getConstant(name);
         }
 
         private RaiseException newException(String className, String message) {