json 1.8.6 → 2.3.0

data/ext/json/extconf.rb

@@ -1,3 +1,2 @@
 require 'mkmf'
 create_makefile('json')
-

data/java/src/json/ext/Generator.java

@@ -7,6 +7,7 @@ package json.ext;
 
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
+import org.jruby.RubyBasicObject;
 import org.jruby.RubyBignum;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
@@ -15,6 +16,7 @@ import org.jruby.RubyFloat;
 import org.jruby.RubyHash;
 import org.jruby.RubyNumeric;
 import org.jruby.RubyString;
+import org.jruby.runtime.ClassIndex;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
@@ -57,6 +59,19 @@ public final class Generator {
         return handler.generateNew(session, object);
     }
 
+    // NOTE: drop this once Ruby 1.9.3 support is gone!
+    private static final int FIXNUM = 1;
+    private static final int BIGNUM = 2;
+    private static final int ARRAY = 3;
+    private static final int STRING = 4;
+    private static final int NIL = 5;
+    private static final int TRUE = 6;
+    private static final int FALSE = 7;
+    private static final int HASH = 10;
+    private static final int FLOAT = 11;
+    // hard-coded due JRuby 1.7 compatibility
+    // https://github.com/jruby/jruby/blob/1.7.27/core/src/main/java/org/jruby/runtime/ClassIndex.java
+
     /**
      * Returns the best serialization handler for the given object.
      */
@@ -65,16 +80,24 @@ public final class Generator {
     @SuppressWarnings("unchecked")
     private static <T extends IRubyObject>
             Handler<? super T> getHandlerFor(Ruby runtime, T object) {
-        RubyClass metaClass = object.getMetaClass();
-        if (metaClass == runtime.getString()) return (Handler)STRING_HANDLER;
-        if (metaClass == runtime.getFixnum()) return (Handler)FIXNUM_HANDLER;
-        if (metaClass == runtime.getHash())   return (Handler)HASH_HANDLER;
-        if (metaClass == runtime.getArray())  return (Handler)ARRAY_HANDLER;
-        if (object.isNil())                   return (Handler)NIL_HANDLER;
-        if (object == runtime.getTrue())      return (Handler)TRUE_HANDLER;
-        if (object == runtime.getFalse())     return (Handler)FALSE_HANDLER;
-        if (metaClass == runtime.getFloat())  return (Handler)FLOAT_HANDLER;
-        if (metaClass == runtime.getBignum()) return (Handler)BIGNUM_HANDLER;
+        switch (((RubyBasicObject) object).getNativeTypeIndex()) {
+            // can not use getNativeClassIndex due 1.7 compatibility
+            case NIL    : return (Handler) NIL_HANDLER;
+            case TRUE   : return (Handler) TRUE_HANDLER;
+            case FALSE  : return (Handler) FALSE_HANDLER;
+            case FLOAT  : return (Handler) FLOAT_HANDLER;
+            case FIXNUM : return (Handler) FIXNUM_HANDLER;
+            case BIGNUM : return (Handler) BIGNUM_HANDLER;
+            case STRING :
+                if (((RubyBasicObject) object).getMetaClass() != runtime.getString()) break;
+                return (Handler) STRING_HANDLER;
+            case ARRAY  :
+                if (((RubyBasicObject) object).getMetaClass() != runtime.getArray()) break;
+                return (Handler) ARRAY_HANDLER;
+            case HASH   :
+                if (((RubyBasicObject) object).getMetaClass() != runtime.getHash()) break;
+                return (Handler) HASH_HANDLER;
+        }
         return GENERIC_HANDLER;
     }
 
@@ -172,9 +195,7 @@ public final class Generator {
             result = RubyString.newString(session.getRuntime(), buffer);
             ThreadContext context = session.getContext();
             RuntimeInfo info = session.getInfo();
-            if (info.encodingsSupported()) {
-                result.force_encoding(context, info.utf8.get());
-            }
+            result.force_encoding(context, info.utf8.get());
             return result;
         }
 
@@ -381,8 +402,7 @@ public final class Generator {
                 RuntimeInfo info = session.getInfo();
                 RubyString src;
 
-                if (info.encodingsSupported() &&
-                        object.encoding(session.getContext()) != info.utf8.get()) {
+                if (object.encoding(session.getContext()) != info.utf8.get()) {
                     src = (RubyString)object.encode(session.getContext(),
                                                     info.utf8.get());
                 } else {

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

@@ -207,45 +207,11 @@ public class GeneratorState extends RubyObject {
     @JRubyMethod
     public IRubyObject generate(ThreadContext context, IRubyObject obj) {
         RubyString result = Generator.generateJson(context, obj, this);
-        if (!quirksMode && !objectOrArrayLiteral(result)) {
-            throw Utils.newException(context, Utils.M_GENERATOR_ERROR,
-                    "only generation of JSON objects or arrays allowed");
-        }
         RuntimeInfo info = RuntimeInfo.forRuntime(context.getRuntime());
-        if (info.encodingsSupported()) {
-            result.force_encoding(context, info.utf8.get());
-        }
+        result.force_encoding(context, info.utf8.get());
         return result;
     }
 
-    /**
-     * Ensures the given string is in the form "[...]" or "{...}", being
-     * possibly surrounded by white space.
-     * The string's encoding must be ASCII-compatible.
-     * @param value
-     * @return
-     */
-    private static boolean objectOrArrayLiteral(RubyString value) {
-        ByteList bl = value.getByteList();
-        int len = bl.length();
-
-        for (int pos = 0; pos < len - 1; pos++) {
-            int b = bl.get(pos);
-            if (Character.isWhitespace(b)) continue;
-
-            // match the opening brace
-            switch (b) {
-            case '[':
-                return matchClosingBrace(bl, pos, len, ']');
-            case '{':
-                return matchClosingBrace(bl, pos, len, '}');
-            default:
-                return false;
-            }
-        }
-        return false;
-    }
-
     private static boolean matchClosingBrace(ByteList bl, int pos, int len,
                                              int brace) {
         for (int endPos = len - 1; endPos > pos; endPos--) {
@@ -398,17 +364,6 @@ 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="buffer_initial_length")
     public RubyInteger buffer_initial_length_get(ThreadContext context) {
         return context.getRuntime().newFixnum(bufferInitialLength);
@@ -421,11 +376,6 @@ public class GeneratorState extends RubyObject {
         return buffer_initial_length;
     }
 
-    @JRubyMethod(name="quirks_mode?")
-    public RubyBoolean quirks_mode_p(ThreadContext context) {
-        return context.getRuntime().newBoolean(quirksMode);
-    }
-
     public int getDepth() {
         return depth;
     }
@@ -444,7 +394,7 @@ 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.get()) {
+        if (str.encoding(context) != info.utf8.get()) {
             str = (RubyString)str.encode(context, info.utf8.get());
         }
         return str.getByteList().dup();
@@ -480,7 +430,6 @@ 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);
         bufferInitialLength = opts.getInt("buffer_initial_length", DEFAULT_BUFFER_INITIAL_LENGTH);
 
         depth = opts.getInt("depth", 0);
@@ -507,7 +456,6 @@ 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));
         result.op_aset(context, runtime.newSymbol("buffer_initial_length"), buffer_initial_length_get(context));

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

@@ -84,7 +84,7 @@ final class OptionsReader {
 
         RubyString str = value.convertToString();
         RuntimeInfo info = getRuntimeInfo();
-        if (info.encodingsSupported() && str.encoding(context) != info.utf8.get()) {
+        if (str.encoding(context) != info.utf8.get()) {
             str = (RubyString)str.encode(context, info.utf8.get());
         }
         return str;

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

@@ -52,9 +52,9 @@ public class Parser extends RubyObject {
     private int maxNesting;
     private boolean allowNaN;
     private boolean symbolizeNames;
-    private boolean quirksMode;
     private RubyClass objectClass;
     private RubyClass arrayClass;
+    private RubyClass decimalClass;
     private RubyHash match_string;
 
     private static final int DEFAULT_MAX_NESTING = 100;
@@ -123,10 +123,6 @@ public class Parser extends RubyObject {
      * <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 matching class and <code>create_id</code> was found. This option
@@ -138,9 +134,10 @@ public class Parser extends RubyObject {
      * <dt><code>:array_class</code>
      * <dd>Defaults to Array.
      *
-     * <dt><code>:quirks_mode</code>
-     * <dd>Enables quirks_mode for parser, that is for example parsing single
-     * JSON values instead of documents is possible.
+     * <dt><code>:decimal_class</code>
+     * <dd>Specifies which class to use instead of the default (Float) when
+     * parsing decimal numbers. This class must accept a single string argument
+     * in its constructor.
      * </dl>
      */
     @JRubyMethod(name = "new", required = 1, optional = 1, meta = true)
@@ -163,15 +160,21 @@ public class Parser extends RubyObject {
         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", false);
         this.objectClass     = opts.getClass("object_class", runtime.getHash());
         this.arrayClass      = opts.getClass("array_class", runtime.getArray());
+        this.decimalClass    = opts.getClass("decimal_class", null);
         this.match_string    = opts.getHash("match_string");
 
+        if(symbolizeNames && createAdditions) {
+          throw runtime.newArgumentError(
+            "options :symbolize_names and :create_additions cannot be " +
+            " used in conjunction"
+          );
+        }
         this.vSource = args[0].convertToString();
-        if (!quirksMode) this.vSource = convertEncoding(context, vSource);
+        this.vSource = convertEncoding(context, vSource);
 
         return this;
     }
@@ -182,33 +185,16 @@ public class Parser extends RubyObject {
      * Returns the source string if no conversion is needed.
      */
     private RubyString convertEncoding(ThreadContext context, RubyString source) {
-        ByteList bl = source.getByteList();
-        int len = bl.length();
-        if (len < 2) {
-            throw Utils.newException(context, Utils.M_PARSER_ERROR,
-                "A JSON text must at least contain two octets!");
-        }
-
-        if (info.encodingsSupported()) {
-            RubyEncoding encoding = (RubyEncoding)source.encoding(context);
-            if (encoding != info.ascii8bit.get()) {
-                return (RubyString)source.encode(context, info.utf8.get());
-            }
-
-            String sniffedEncoding = sniffByteList(bl);
-            if (sniffedEncoding == null) return source; // assume UTF-8
-            return reinterpretEncoding(context, source, sniffedEncoding);
-        }
-
-        String sniffedEncoding = sniffByteList(bl);
-        if (sniffedEncoding == null) return source; // assume UTF-8
-        Ruby runtime = context.getRuntime();
-        return (RubyString)info.jsonModule.get().
-            callMethod(context, "iconv",
-                new IRubyObject[] {
-                    runtime.newString("utf-8"),
-                    runtime.newString(sniffedEncoding),
-                    source});
+      RubyEncoding encoding = (RubyEncoding)source.encoding(context);
+      if (encoding == info.ascii8bit.get()) {
+          if (source.isFrozen()) {
+            source = (RubyString) source.dup();
+          }
+          source.force_encoding(context, info.utf8.get());
+      } else {
+        source = (RubyString) source.encode(context, info.utf8.get());
+      }
+      return source;
     }
 
     /**
@@ -261,17 +247,6 @@ public class Parser extends RubyObject {
         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;
@@ -338,11 +313,11 @@ public class Parser extends RubyObject {
         }
 
         
-// line 365 "Parser.rl"
+// line 339 "Parser.rl"
 
 
         
-// line 347 "Parser.java"
+// line 321 "Parser.java"
 private static byte[] init__JSON_value_actions_0()
 {
 	return new byte [] {
@@ -456,7 +431,7 @@ static final int JSON_value_error = 0;
 static final int JSON_value_en_main = 1;
 
 
-// line 471 "Parser.rl"
+// line 445 "Parser.rl"
 
 
         void parseValue(ParserResult res, int p, int pe) {
@@ -464,14 +439,14 @@ static final int JSON_value_en_main = 1;
             IRubyObject result = null;
 
             
-// line 469 "Parser.java"
+// line 443 "Parser.java"
 	{
 	cs = JSON_value_start;
 	}
 
-// line 478 "Parser.rl"
+// line 452 "Parser.rl"
             
-// line 476 "Parser.java"
+// line 450 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -497,13 +472,13 @@ case 1:
 	while ( _nacts-- > 0 ) {
 		switch ( _JSON_value_actions[_acts++] ) {
 	case 9:
-// line 456 "Parser.rl"
+// line 430 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 508 "Parser.java"
+// line 482 "Parser.java"
 		}
 	}
 
@@ -566,25 +541,25 @@ case 1:
 			switch ( _JSON_value_actions[_acts++] )
 			{
 	case 0:
-// line 373 "Parser.rl"
+// line 347 "Parser.rl"
 	{
                 result = getRuntime().getNil();
             }
 	break;
 	case 1:
-// line 376 "Parser.rl"
+// line 350 "Parser.rl"
 	{
                 result = getRuntime().getFalse();
             }
 	break;
 	case 2:
-// line 379 "Parser.rl"
+// line 353 "Parser.rl"
 	{
                 result = getRuntime().getTrue();
             }
 	break;
 	case 3:
-// line 382 "Parser.rl"
+// line 356 "Parser.rl"
 	{
                 if (parser.allowNaN) {
                     result = getConstant(CONST_NAN);
@@ -594,7 +569,7 @@ case 1:
             }
 	break;
 	case 4:
-// line 389 "Parser.rl"
+// line 363 "Parser.rl"
 	{
                 if (parser.allowNaN) {
                     result = getConstant(CONST_INFINITY);
@@ -604,9 +579,9 @@ case 1:
             }
 	break;
 	case 5:
-// line 396 "Parser.rl"
+// line 370 "Parser.rl"
 	{
-                if (pe > p + 9 - (parser.quirksMode ? 1 : 0) &&
+                if (pe > p + 8 &&
                     absSubSequence(p, p + 9).equals(JSON_MINUS_INFINITY)) {
 
                     if (parser.allowNaN) {
@@ -633,7 +608,7 @@ case 1:
             }
 	break;
 	case 6:
-// line 422 "Parser.rl"
+// line 396 "Parser.rl"
 	{
                 parseString(res, p, pe);
                 if (res.result == null) {
@@ -646,7 +621,7 @@ case 1:
             }
 	break;
 	case 7:
-// line 432 "Parser.rl"
+// line 406 "Parser.rl"
 	{
                 currentNesting++;
                 parseArray(res, p, pe);
@@ -661,7 +636,7 @@ case 1:
             }
 	break;
 	case 8:
-// line 444 "Parser.rl"
+// line 418 "Parser.rl"
 	{
                 currentNesting++;
                 parseObject(res, p, pe);
@@ -675,7 +650,7 @@ case 1:
                 }
             }
 	break;
-// line 680 "Parser.java"
+// line 654 "Parser.java"
 			}
 		}
 	}
@@ -695,7 +670,7 @@ case 5:
 	break; }
 	}
 
-// line 479 "Parser.rl"
+// line 453 "Parser.rl"
 
             if (cs >= JSON_value_first_final && result != null) {
                 res.update(result, p);
@@ -705,7 +680,7 @@ case 5:
         }
 
         
-// line 710 "Parser.java"
+// line 684 "Parser.java"
 private static byte[] init__JSON_integer_actions_0()
 {
 	return new byte [] {
@@ -804,7 +779,7 @@ static final int JSON_integer_error = 0;
 static final int JSON_integer_en_main = 1;
 
 
-// line 498 "Parser.rl"
+// line 472 "Parser.rl"
 
 
         void parseInteger(ParserResult res, int p, int pe) {
@@ -822,15 +797,15 @@ static final int JSON_integer_en_main = 1;
             int cs = EVIL;
 
             
-// line 827 "Parser.java"
+// line 801 "Parser.java"
 	{
 	cs = JSON_integer_start;
 	}
 
-// line 515 "Parser.rl"
+// line 489 "Parser.rl"
             int memo = p;
             
-// line 835 "Parser.java"
+// line 809 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -911,13 +886,13 @@ case 1:
 			switch ( _JSON_integer_actions[_acts++] )
 			{
 	case 0:
-// line 492 "Parser.rl"
+// line 466 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 922 "Parser.java"
+// line 896 "Parser.java"
 			}
 		}
 	}
@@ -937,7 +912,7 @@ case 5:
 	break; }
 	}
 
-// line 517 "Parser.rl"
+// line 491 "Parser.rl"
 
             if (cs < JSON_integer_first_final) {
                 return -1;
@@ -945,13 +920,13 @@ case 5:
 
             return p;
         }
-        
+
         RubyInteger createInteger(int p, int new_p) {
             Ruby runtime = getRuntime();
             ByteList num = absSubSequence(p, new_p);
             return bytesToInum(runtime, num);
         }
-        
+
         RubyInteger bytesToInum(Ruby runtime, ByteList num) {
             return runtime.is1_9() ?
                     ConvertBytes.byteListToInum19(runtime, num, 10, true) :
@@ -959,7 +934,7 @@ case 5:
         }
 
         
-// line 964 "Parser.java"
+// line 938 "Parser.java"
 private static byte[] init__JSON_float_actions_0()
 {
 	return new byte [] {
@@ -1061,7 +1036,7 @@ static final int JSON_float_error = 0;
 static final int JSON_float_en_main = 1;
 
 
-// line 552 "Parser.rl"
+// line 526 "Parser.rl"
 
 
         void parseFloat(ParserResult res, int p, int pe) {
@@ -1070,7 +1045,9 @@ static final int JSON_float_en_main = 1;
                 res.update(null, p);
                 return;
             }
-            RubyFloat number = createFloat(p, new_p);
+            IRubyObject number = parser.decimalClass == null ?
+                createFloat(p, new_p) : createCustomDecimal(p, new_p);
+
             res.update(number, new_p + 1);
             return;
         }
@@ -1079,15 +1056,15 @@ static final int JSON_float_en_main = 1;
             int cs = EVIL;
 
             
-// line 1084 "Parser.java"
+// line 1060 "Parser.java"
 	{
 	cs = JSON_float_start;
 	}
 
-// line 569 "Parser.rl"
+// line 545 "Parser.rl"
             int memo = p;
             
-// line 1092 "Parser.java"
+// line 1068 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1168,13 +1145,13 @@ case 1:
 			switch ( _JSON_float_actions[_acts++] )
 			{
 	case 0:
-// line 543 "Parser.rl"
+// line 517 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1179 "Parser.java"
+// line 1155 "Parser.java"
 			}
 		}
 	}
@@ -1194,23 +1171,30 @@ case 5:
 	break; }
 	}
 
-// line 571 "Parser.rl"
+// line 547 "Parser.rl"
 
             if (cs < JSON_float_first_final) {
                 return -1;
             }
-            
+
             return p;
         }
-        
+
         RubyFloat createFloat(int p, int new_p) {
             Ruby runtime = getRuntime();
             ByteList num = absSubSequence(p, new_p);
             return RubyFloat.newFloat(runtime, dc.parse(num, true, runtime.is1_9()));
         }
 
+        IRubyObject createCustomDecimal(int p, int new_p) {
+            Ruby runtime = getRuntime();
+            ByteList num = absSubSequence(p, new_p);
+            IRubyObject numString = runtime.newString(num.toString());
+            return parser.decimalClass.callMethod(context, "new", numString);
+        }
+
         
-// line 1215 "Parser.java"
+// line 1198 "Parser.java"
 private static byte[] init__JSON_string_actions_0()
 {
 	return new byte [] {
@@ -1312,7 +1296,7 @@ static final int JSON_string_error = 0;
 static final int JSON_string_en_main = 1;
 
 
-// line 616 "Parser.rl"
+// line 599 "Parser.rl"
 
 
         void parseString(ParserResult res, int p, int pe) {
@@ -1320,15 +1304,15 @@ static final int JSON_string_en_main = 1;
             IRubyObject result = null;
 
             
-// line 1325 "Parser.java"
+// line 1308 "Parser.java"
 	{
 	cs = JSON_string_start;
 	}
 
-// line 623 "Parser.rl"
+// line 606 "Parser.rl"
             int memo = p;
             
-// line 1333 "Parser.java"
+// line 1316 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1409,7 +1393,7 @@ case 1:
 			switch ( _JSON_string_actions[_acts++] )
 			{
 	case 0:
-// line 591 "Parser.rl"
+// line 574 "Parser.rl"
 	{
                 int offset = byteList.begin();
                 ByteList decoded = decoder.decode(byteList, memo + 1 - offset,
@@ -1424,13 +1408,13 @@ case 1:
             }
 	break;
 	case 1:
-// line 604 "Parser.rl"
+// line 587 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1435 "Parser.java"
+// line 1418 "Parser.java"
 			}
 		}
 	}
@@ -1450,14 +1434,14 @@ case 5:
 	break; }
 	}
 
-// line 625 "Parser.rl"
+// line 608 "Parser.rl"
 
             if (parser.createAdditions) {
-                RubyHash match_string = parser.match_string;
-                if (match_string != null) {
+                RubyHash matchString = parser.match_string;
+                if (matchString != null) {
                     final IRubyObject[] memoArray = { result, null };
                     try {
-                      match_string.visitAll(new RubyHash.Visitor() {
+                      matchString.visitAll(new RubyHash.Visitor() {
                           @Override
                           public void visit(IRubyObject pattern, IRubyObject klass) {
                               if (pattern.callMethod(context, "===", memoArray[0]).isTrue()) {
@@ -1477,8 +1461,8 @@ case 5:
                 }
             }
 
-            if (cs >= JSON_string_first_final && result != null) {                
-                if (info.encodingsSupported() && result instanceof RubyString) {
+            if (cs >= JSON_string_first_final && result != null) {
+                if (result instanceof RubyString) {
                   ((RubyString)result).force_encoding(context, info.utf8.get());
                 }
                 res.update(result, p + 1);
@@ -1488,7 +1472,7 @@ case 5:
         }
 
         
-// line 1493 "Parser.java"
+// line 1476 "Parser.java"
 private static byte[] init__JSON_array_actions_0()
 {
 	return new byte [] {
@@ -1601,7 +1585,7 @@ static final int JSON_array_error = 0;
 static final int JSON_array_en_main = 1;
 
 
-// line 698 "Parser.rl"
+// line 681 "Parser.rl"
 
 
         void parseArray(ParserResult res, int p, int pe) {
@@ -1621,14 +1605,14 @@ static final int JSON_array_en_main = 1;
             }
 
             
-// line 1626 "Parser.java"
+// line 1609 "Parser.java"
 	{
 	cs = JSON_array_start;
 	}
 
-// line 717 "Parser.rl"
+// line 700 "Parser.rl"
             
-// line 1633 "Parser.java"
+// line 1616 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1709,7 +1693,7 @@ case 1:
 			switch ( _JSON_array_actions[_acts++] )
 			{
 	case 0:
-// line 667 "Parser.rl"
+// line 650 "Parser.rl"
 	{
                 parseValue(res, p, pe);
                 if (res.result == null) {
@@ -1726,13 +1710,13 @@ case 1:
             }
 	break;
 	case 1:
-// line 682 "Parser.rl"
+// line 665 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1737 "Parser.java"
+// line 1720 "Parser.java"
 			}
 		}
 	}
@@ -1752,7 +1736,7 @@ case 5:
 	break; }
 	}
 
-// line 718 "Parser.rl"
+// line 701 "Parser.rl"
 
             if (cs >= JSON_array_first_final) {
                 res.update(result, p + 1);
@@ -1762,7 +1746,7 @@ case 5:
         }
 
         
-// line 1767 "Parser.java"
+// line 1750 "Parser.java"
 private static byte[] init__JSON_object_actions_0()
 {
 	return new byte [] {
@@ -1885,7 +1869,7 @@ static final int JSON_object_error = 0;
 static final int JSON_object_en_main = 1;
 
 
-// line 777 "Parser.rl"
+// line 760 "Parser.rl"
 
 
         void parseObject(ParserResult res, int p, int pe) {
@@ -1910,14 +1894,14 @@ static final int JSON_object_en_main = 1;
             }
 
             
-// line 1915 "Parser.java"
+// line 1898 "Parser.java"
 	{
 	cs = JSON_object_start;
 	}
 
-// line 801 "Parser.rl"
+// line 784 "Parser.rl"
             
-// line 1922 "Parser.java"
+// line 1905 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1998,7 +1982,7 @@ case 1:
 			switch ( _JSON_object_actions[_acts++] )
 			{
 	case 0:
-// line 732 "Parser.rl"
+// line 715 "Parser.rl"
 	{
                 parseValue(res, p, pe);
                 if (res.result == null) {
@@ -2015,7 +1999,7 @@ case 1:
             }
 	break;
 	case 1:
-// line 747 "Parser.rl"
+// line 730 "Parser.rl"
 	{
                 parseString(res, p, pe);
                 if (res.result == null) {
@@ -2035,13 +2019,13 @@ case 1:
             }
 	break;
 	case 2:
-// line 765 "Parser.rl"
+// line 748 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 2046 "Parser.java"
+// line 2029 "Parser.java"
 			}
 		}
 	}
@@ -2061,7 +2045,7 @@ case 5:
 	break; }
 	}
 
-// line 802 "Parser.rl"
+// line 785 "Parser.rl"
 
             if (cs < JSON_object_first_final) {
                 res.update(null, p + 1);
@@ -2094,11 +2078,11 @@ case 5:
         }
 
         
-// line 2099 "Parser.java"
+// line 2082 "Parser.java"
 private static byte[] init__JSON_actions_0()
 {
 	return new byte [] {
-	    0,    1,    0,    1,    1
+	    0,    1,    0
 	};
 }
 
@@ -2108,7 +2092,7 @@ private static final byte _JSON_actions[] = init__JSON_actions_0();
 private static byte[] init__JSON_key_offsets_0()
 {
 	return new byte [] {
-	    0,    0,    7,    9,   10,   12,   13,   15,   16,   18,   19
+	    0,    0,   16,   18,   19,   21,   22,   24,   25,   27,   28
 	};
 }
 
@@ -2118,9 +2102,9 @@ private static final byte _JSON_key_offsets[] = init__JSON_key_offsets_0();
 private static char[] init__JSON_trans_keys_0()
 {
 	return new char [] {
-	   13,   32,   47,   91,  123,    9,   10,   42,   47,   42,   42,   47,
-	   10,   42,   47,   42,   42,   47,   10,   13,   32,   47,    9,   10,
-	    0
+	   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
 	};
 }
 
@@ -2130,7 +2114,7 @@ private static final char _JSON_trans_keys[] = init__JSON_trans_keys_0();
 private static byte[] init__JSON_single_lengths_0()
 {
 	return new byte [] {
-	    0,    5,    2,    1,    2,    1,    2,    1,    2,    1,    3
+	    0,   12,    2,    1,    2,    1,    2,    1,    2,    1,    3
 	};
 }
 
@@ -2140,7 +2124,7 @@ private static final byte _JSON_single_lengths[] = init__JSON_single_lengths_0()
 private static byte[] init__JSON_range_lengths_0()
 {
 	return new byte [] {
-	    0,    1,    0,    0,    0,    0,    0,    0,    0,    0,    1
+	    0,    2,    0,    0,    0,    0,    0,    0,    0,    0,    1
 	};
 }
 
@@ -2150,7 +2134,7 @@ private static final byte _JSON_range_lengths[] = init__JSON_range_lengths_0();
 private static byte[] init__JSON_index_offsets_0()
 {
 	return new byte [] {
-	    0,    0,    7,   10,   12,   15,   17,   20,   22,   25,   27
+	    0,    0,   15,   18,   20,   23,   25,   28,   30,   33,   35
 	};
 }
 
@@ -2160,9 +2144,10 @@ private static final byte _JSON_index_offsets[] = init__JSON_index_offsets_0();
 private static byte[] init__JSON_indicies_0()
 {
 	return new byte [] {
-	    0,    0,    2,    3,    4,    0,    1,    5,    6,    1,    7,    5,
-	    7,    0,    5,    0,    6,    8,    9,    1,   10,    8,   10,   11,
-	    8,   11,    9,   11,   11,   12,   11,    1,    0
+	    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
 	};
 }
 
@@ -2172,8 +2157,7 @@ private static final byte _JSON_indicies[] = init__JSON_indicies_0();
 private static byte[] init__JSON_trans_targs_0()
 {
 	return new byte [] {
-	    1,    0,    2,   10,   10,    3,    5,    4,    7,    9,    8,   10,
-	    6
+	    1,    0,   10,    6,    3,    5,    4,   10,    7,    9,    8,    2
 	};
 }
 
@@ -2183,8 +2167,7 @@ private static final byte _JSON_trans_targs[] = init__JSON_trans_targs_0();
 private static byte[] init__JSON_trans_actions_0()
 {
 	return new byte [] {
-	    0,    0,    0,    3,    1,    0,    0,    0,    0,    0,    0,    0,
-	    0
+	    0,    0,    1,    0,    0,    0,    0,    0,    0,    0,    0,    0
 	};
 }
 
@@ -2198,26 +2181,26 @@ static final int JSON_error = 0;
 static final int JSON_en_main = 1;
 
 
-// line 867 "Parser.rl"
+// line 836 "Parser.rl"
 
 
-        public IRubyObject parseStrict() {
+        public IRubyObject parseImplemetation() {
             int cs = EVIL;
             int p, pe;
             IRubyObject result = null;
             ParserResult res = new ParserResult();
 
             
-// line 2213 "Parser.java"
+// line 2195 "Parser.java"
 	{
 	cs = JSON_start;
 	}
 
-// line 876 "Parser.rl"
+// line 845 "Parser.rl"
             p = byteList.begin();
             pe = p + byteList.length();
             
-// line 2222 "Parser.java"
+// line 2204 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -2298,267 +2281,7 @@ case 1:
 			switch ( _JSON_actions[_acts++] )
 			{
 	case 0:
-// line 839 "Parser.rl"
-	{
-                currentNesting = 1;
-                parseObject(res, p, pe);
-                if (res.result == null) {
-                    p--;
-                    { p += 1; _goto_targ = 5; if (true)  continue _goto;}
-                } else {
-                    result = res.result;
-                    {p = (( res.p))-1;}
-                }
-            }
-	break;
-	case 1:
-// line 851 "Parser.rl"
-	{
-                currentNesting = 1;
-                parseArray(res, p, pe);
-                if (res.result == null) {
-                    p--;
-                    { p += 1; _goto_targ = 5; if (true)  continue _goto;}
-                } else {
-                    result = res.result;
-                    {p = (( res.p))-1;}
-                }
-            }
-	break;
-// line 2330 "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 879 "Parser.rl"
-
-            if (cs >= JSON_first_final && p == pe) {
-                return result;
-            } else {
-                throw unexpectedToken(p, pe);
-            }
-        }
-
-        
-// line 2360 "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 907 "Parser.rl"
-
-
-        public IRubyObject parseQuirksMode() {
-            int cs = EVIL;
-            int p, pe;
-            IRubyObject result = null;
-            ParserResult res = new ParserResult();
-
-            
-// line 2473 "Parser.java"
-	{
-	cs = JSON_quirks_mode_start;
-	}
-
-// line 916 "Parser.rl"
-            p = byteList.begin();
-            pe = p + byteList.length();
-            
-// line 2482 "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 893 "Parser.rl"
+// line 822 "Parser.rl"
 	{
                 parseValue(res, p, pe);
                 if (res.result == null) {
@@ -2570,7 +2293,7 @@ case 1:
                 }
             }
 	break;
-// line 2575 "Parser.java"
+// line 2297 "Parser.java"
 			}
 		}
 	}
@@ -2590,9 +2313,9 @@ case 5:
 	break; }
 	}
 
-// line 919 "Parser.rl"
+// line 848 "Parser.rl"
 
-            if (cs >= JSON_quirks_mode_first_final && p == pe) {
+            if (cs >= JSON_first_final && p == pe) {
                 return result;
             } else {
                 throw unexpectedToken(p, pe);
@@ -2600,12 +2323,7 @@ case 5:
         }
 
         public IRubyObject parse() {
-          if (parser.quirksMode) {
-            return parseQuirksMode();
-          } else {
-            return parseStrict();
-          }
-
+            return parseImplemetation();
         }
 
         /**