json 1.8.3 → 2.4.0

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

@@ -3,8 +3,7 @@
 /*
  * 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.
+ * Distributed under the Ruby license: https://www.ruby-lang.org/en/about/license.txt
  */
 package json.ext;
 
@@ -53,9 +52,10 @@ public class Parser extends RubyObject {
     private int maxNesting;
     private boolean allowNaN;
     private boolean symbolizeNames;
-    private boolean quirksMode;
+    private boolean freeze;
     private RubyClass objectClass;
     private RubyClass arrayClass;
+    private RubyClass decimalClass;
     private RubyHash match_string;
 
     private static final int DEFAULT_MAX_NESTING = 100;
@@ -124,10 +124,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
@@ -139,9 +135,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)
@@ -164,15 +161,22 @@ 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.freeze          = opts.getBool("freeze", 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;
     }
@@ -183,33 +187,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;
     }
 
     /**
@@ -262,17 +249,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;
@@ -339,11 +315,11 @@ public class Parser extends RubyObject {
         }
 
         
-// line 365 "Parser.rl"
+// line 341 "Parser.rl"
 
 
         
-// line 347 "Parser.java"
+// line 323 "Parser.java"
 private static byte[] init__JSON_value_actions_0()
 {
 	return new byte [] {
@@ -457,7 +433,7 @@ static final int JSON_value_error = 0;
 static final int JSON_value_en_main = 1;
 
 
-// line 471 "Parser.rl"
+// line 447 "Parser.rl"
 
 
         void parseValue(ParserResult res, int p, int pe) {
@@ -465,14 +441,14 @@ static final int JSON_value_en_main = 1;
             IRubyObject result = null;
 
             
-// line 469 "Parser.java"
+// line 445 "Parser.java"
 	{
 	cs = JSON_value_start;
 	}
 
-// line 478 "Parser.rl"
+// line 454 "Parser.rl"
             
-// line 476 "Parser.java"
+// line 452 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -498,13 +474,13 @@ case 1:
 	while ( _nacts-- > 0 ) {
 		switch ( _JSON_value_actions[_acts++] ) {
 	case 9:
-// line 456 "Parser.rl"
+// line 432 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 508 "Parser.java"
+// line 484 "Parser.java"
 		}
 	}
 
@@ -567,25 +543,25 @@ case 1:
 			switch ( _JSON_value_actions[_acts++] )
 			{
 	case 0:
-// line 373 "Parser.rl"
+// line 349 "Parser.rl"
 	{
                 result = getRuntime().getNil();
             }
 	break;
 	case 1:
-// line 376 "Parser.rl"
+// line 352 "Parser.rl"
 	{
                 result = getRuntime().getFalse();
             }
 	break;
 	case 2:
-// line 379 "Parser.rl"
+// line 355 "Parser.rl"
 	{
                 result = getRuntime().getTrue();
             }
 	break;
 	case 3:
-// line 382 "Parser.rl"
+// line 358 "Parser.rl"
 	{
                 if (parser.allowNaN) {
                     result = getConstant(CONST_NAN);
@@ -595,7 +571,7 @@ case 1:
             }
 	break;
 	case 4:
-// line 389 "Parser.rl"
+// line 365 "Parser.rl"
 	{
                 if (parser.allowNaN) {
                     result = getConstant(CONST_INFINITY);
@@ -605,9 +581,9 @@ case 1:
             }
 	break;
 	case 5:
-// line 396 "Parser.rl"
+// line 372 "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) {
@@ -634,7 +610,7 @@ case 1:
             }
 	break;
 	case 6:
-// line 422 "Parser.rl"
+// line 398 "Parser.rl"
 	{
                 parseString(res, p, pe);
                 if (res.result == null) {
@@ -647,7 +623,7 @@ case 1:
             }
 	break;
 	case 7:
-// line 432 "Parser.rl"
+// line 408 "Parser.rl"
 	{
                 currentNesting++;
                 parseArray(res, p, pe);
@@ -662,7 +638,7 @@ case 1:
             }
 	break;
 	case 8:
-// line 444 "Parser.rl"
+// line 420 "Parser.rl"
 	{
                 currentNesting++;
                 parseObject(res, p, pe);
@@ -676,7 +652,7 @@ case 1:
                 }
             }
 	break;
-// line 680 "Parser.java"
+// line 656 "Parser.java"
 			}
 		}
 	}
@@ -696,9 +672,12 @@ case 5:
 	break; }
 	}
 
-// line 479 "Parser.rl"
+// line 455 "Parser.rl"
 
             if (cs >= JSON_value_first_final && result != null) {
+                if (parser.freeze) {
+                  result.setFrozen(true);
+                }
                 res.update(result, p);
             } else {
                 res.update(null, p);
@@ -706,7 +685,7 @@ case 5:
         }
 
         
-// line 710 "Parser.java"
+// line 689 "Parser.java"
 private static byte[] init__JSON_integer_actions_0()
 {
 	return new byte [] {
@@ -805,7 +784,7 @@ static final int JSON_integer_error = 0;
 static final int JSON_integer_en_main = 1;
 
 
-// line 498 "Parser.rl"
+// line 477 "Parser.rl"
 
 
         void parseInteger(ParserResult res, int p, int pe) {
@@ -823,15 +802,15 @@ static final int JSON_integer_en_main = 1;
             int cs = EVIL;
 
             
-// line 827 "Parser.java"
+// line 806 "Parser.java"
 	{
 	cs = JSON_integer_start;
 	}
 
-// line 515 "Parser.rl"
+// line 494 "Parser.rl"
             int memo = p;
             
-// line 835 "Parser.java"
+// line 814 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -912,13 +891,13 @@ case 1:
 			switch ( _JSON_integer_actions[_acts++] )
 			{
 	case 0:
-// line 492 "Parser.rl"
+// line 471 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 922 "Parser.java"
+// line 901 "Parser.java"
 			}
 		}
 	}
@@ -938,7 +917,7 @@ case 5:
 	break; }
 	}
 
-// line 517 "Parser.rl"
+// line 496 "Parser.rl"
 
             if (cs < JSON_integer_first_final) {
                 return -1;
@@ -946,13 +925,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) :
@@ -960,7 +939,7 @@ case 5:
         }
 
         
-// line 964 "Parser.java"
+// line 943 "Parser.java"
 private static byte[] init__JSON_float_actions_0()
 {
 	return new byte [] {
@@ -1062,7 +1041,7 @@ static final int JSON_float_error = 0;
 static final int JSON_float_en_main = 1;
 
 
-// line 552 "Parser.rl"
+// line 531 "Parser.rl"
 
 
         void parseFloat(ParserResult res, int p, int pe) {
@@ -1071,7 +1050,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;
         }
@@ -1080,15 +1061,15 @@ static final int JSON_float_en_main = 1;
             int cs = EVIL;
 
             
-// line 1084 "Parser.java"
+// line 1065 "Parser.java"
 	{
 	cs = JSON_float_start;
 	}
 
-// line 569 "Parser.rl"
+// line 550 "Parser.rl"
             int memo = p;
             
-// line 1092 "Parser.java"
+// line 1073 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1169,13 +1150,13 @@ case 1:
 			switch ( _JSON_float_actions[_acts++] )
 			{
 	case 0:
-// line 543 "Parser.rl"
+// line 522 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1179 "Parser.java"
+// line 1160 "Parser.java"
 			}
 		}
 	}
@@ -1195,23 +1176,30 @@ case 5:
 	break; }
 	}
 
-// line 571 "Parser.rl"
+// line 552 "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 1203 "Parser.java"
 private static byte[] init__JSON_string_actions_0()
 {
 	return new byte [] {
@@ -1313,7 +1301,7 @@ static final int JSON_string_error = 0;
 static final int JSON_string_en_main = 1;
 
 
-// line 616 "Parser.rl"
+// line 604 "Parser.rl"
 
 
         void parseString(ParserResult res, int p, int pe) {
@@ -1321,15 +1309,15 @@ static final int JSON_string_en_main = 1;
             IRubyObject result = null;
 
             
-// line 1325 "Parser.java"
+// line 1313 "Parser.java"
 	{
 	cs = JSON_string_start;
 	}
 
-// line 623 "Parser.rl"
+// line 611 "Parser.rl"
             int memo = p;
             
-// line 1333 "Parser.java"
+// line 1321 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1410,7 +1398,7 @@ case 1:
 			switch ( _JSON_string_actions[_acts++] )
 			{
 	case 0:
-// line 591 "Parser.rl"
+// line 579 "Parser.rl"
 	{
                 int offset = byteList.begin();
                 ByteList decoded = decoder.decode(byteList, memo + 1 - offset,
@@ -1425,13 +1413,13 @@ case 1:
             }
 	break;
 	case 1:
-// line 604 "Parser.rl"
+// line 592 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1435 "Parser.java"
+// line 1423 "Parser.java"
 			}
 		}
 	}
@@ -1451,14 +1439,14 @@ case 5:
 	break; }
 	}
 
-// line 625 "Parser.rl"
+// line 613 "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()) {
@@ -1478,18 +1466,25 @@ case 5:
                 }
             }
 
-            if (cs >= JSON_string_first_final && result != null) {                
-                if (info.encodingsSupported() && result instanceof RubyString) {
-                  ((RubyString)result).force_encoding(context, info.utf8.get());
+            if (cs >= JSON_string_first_final && result != null) {
+                if (result instanceof RubyString) {
+                  RubyString string = (RubyString)result;
+                  string.force_encoding(context, info.utf8.get());
+                  if (parser.freeze) {
+                     string.setFrozen(true);
+                     string = getRuntime().freezeAndDedupString(string);
+                  }
+                  res.update(string, p + 1);
+                } else {
+                  res.update(result, p + 1);
                 }
-                res.update(result, p + 1);
             } else {
                 res.update(null, p + 1);
             }
         }
 
         
-// line 1493 "Parser.java"
+// line 1488 "Parser.java"
 private static byte[] init__JSON_array_actions_0()
 {
 	return new byte [] {
@@ -1602,7 +1597,7 @@ static final int JSON_array_error = 0;
 static final int JSON_array_en_main = 1;
 
 
-// line 698 "Parser.rl"
+// line 693 "Parser.rl"
 
 
         void parseArray(ParserResult res, int p, int pe) {
@@ -1622,14 +1617,14 @@ static final int JSON_array_en_main = 1;
             }
 
             
-// line 1626 "Parser.java"
+// line 1621 "Parser.java"
 	{
 	cs = JSON_array_start;
 	}
 
-// line 717 "Parser.rl"
+// line 712 "Parser.rl"
             
-// line 1633 "Parser.java"
+// line 1628 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1710,7 +1705,7 @@ case 1:
 			switch ( _JSON_array_actions[_acts++] )
 			{
 	case 0:
-// line 667 "Parser.rl"
+// line 662 "Parser.rl"
 	{
                 parseValue(res, p, pe);
                 if (res.result == null) {
@@ -1727,13 +1722,13 @@ case 1:
             }
 	break;
 	case 1:
-// line 682 "Parser.rl"
+// line 677 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1737 "Parser.java"
+// line 1732 "Parser.java"
 			}
 		}
 	}
@@ -1753,7 +1748,7 @@ case 5:
 	break; }
 	}
 
-// line 718 "Parser.rl"
+// line 713 "Parser.rl"
 
             if (cs >= JSON_array_first_final) {
                 res.update(result, p + 1);
@@ -1763,7 +1758,7 @@ case 5:
         }
 
         
-// line 1767 "Parser.java"
+// line 1762 "Parser.java"
 private static byte[] init__JSON_object_actions_0()
 {
 	return new byte [] {
@@ -1886,7 +1881,7 @@ static final int JSON_object_error = 0;
 static final int JSON_object_en_main = 1;
 
 
-// line 777 "Parser.rl"
+// line 772 "Parser.rl"
 
 
         void parseObject(ParserResult res, int p, int pe) {
@@ -1911,14 +1906,14 @@ static final int JSON_object_en_main = 1;
             }
 
             
-// line 1915 "Parser.java"
+// line 1910 "Parser.java"
 	{
 	cs = JSON_object_start;
 	}
 
-// line 801 "Parser.rl"
+// line 796 "Parser.rl"
             
-// line 1922 "Parser.java"
+// line 1917 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1999,7 +1994,7 @@ case 1:
 			switch ( _JSON_object_actions[_acts++] )
 			{
 	case 0:
-// line 732 "Parser.rl"
+// line 727 "Parser.rl"
 	{
                 parseValue(res, p, pe);
                 if (res.result == null) {
@@ -2016,7 +2011,7 @@ case 1:
             }
 	break;
 	case 1:
-// line 747 "Parser.rl"
+// line 742 "Parser.rl"
 	{
                 parseString(res, p, pe);
                 if (res.result == null) {
@@ -2036,13 +2031,13 @@ case 1:
             }
 	break;
 	case 2:
-// line 765 "Parser.rl"
+// line 760 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 2046 "Parser.java"
+// line 2041 "Parser.java"
 			}
 		}
 	}
@@ -2062,7 +2057,7 @@ case 5:
 	break; }
 	}
 
-// line 802 "Parser.rl"
+// line 797 "Parser.rl"
 
             if (cs < JSON_object_first_final) {
                 res.update(null, p + 1);
@@ -2095,11 +2090,11 @@ case 5:
         }
 
         
-// line 2099 "Parser.java"
+// line 2094 "Parser.java"
 private static byte[] init__JSON_actions_0()
 {
 	return new byte [] {
-	    0,    1,    0,    1,    1
+	    0,    1,    0
 	};
 }
 
@@ -2109,7 +2104,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
 	};
 }
 
@@ -2119,9 +2114,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
 	};
 }
 
@@ -2131,7 +2126,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
 	};
 }
 
@@ -2141,7 +2136,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
 	};
 }
 
@@ -2151,7 +2146,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
 	};
 }
 
@@ -2161,9 +2156,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
 	};
 }
 
@@ -2173,8 +2169,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
 	};
 }
 
@@ -2184,8 +2179,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
 	};
 }
 
@@ -2199,26 +2193,26 @@ static final int JSON_error = 0;
 static final int JSON_en_main = 1;
 
 
-// line 867 "Parser.rl"
+// line 848 "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 2207 "Parser.java"
 	{
 	cs = JSON_start;
 	}
 
-// line 876 "Parser.rl"
+// line 857 "Parser.rl"
             p = byteList.begin();
             pe = p + byteList.length();
             
-// line 2222 "Parser.java"
+// line 2216 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -2299,267 +2293,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 834 "Parser.rl"
 	{
                 parseValue(res, p, pe);
                 if (res.result == null) {
@@ -2571,7 +2305,7 @@ case 1:
                 }
             }
 	break;
-// line 2575 "Parser.java"
+// line 2309 "Parser.java"
 			}
 		}
 	}
@@ -2591,9 +2325,9 @@ case 5:
 	break; }
 	}
 
-// line 919 "Parser.rl"
+// line 860 "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);
@@ -2601,12 +2335,7 @@ case 5:
         }
 
         public IRubyObject parse() {
-          if (parser.quirksMode) {
-            return parseQuirksMode();
-          } else {
-            return parseStrict();
-          }
-
+            return parseImplemetation();
         }
 
         /**