json_pure 2.0.4 → 2.4.0

data/ext/json/ext/parser/parser.h

@@ -37,8 +37,10 @@ typedef struct JSON_ParserStruct {
     int allow_nan;
     int parsing_name;
     int symbolize_names;
+    int freeze;
     VALUE object_class;
     VALUE array_class;
+    VALUE decimal_class;
     int create_additions;
     VALUE match_string;
     FBuffer *fbuffer;

data/ext/json/ext/parser/parser.rl

@@ -25,7 +25,7 @@ enc_raise(rb_encoding *enc, VALUE exc, const char *fmt, ...)
 
 /* unicode */
 
-static const char digit_values[256] = {
+static const signed char digit_values[256] = {
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1,
@@ -44,7 +44,7 @@ static const char digit_values[256] = {
 
 static UTF32 unescape_unicode(const unsigned char *p)
 {
-    char b;
+    signed char b;
     UTF32 result = 0;
     b = digit_values[p[0]];
     if (b < 0) return UNI_REPLACEMENT_CHAR;
@@ -89,11 +89,13 @@ static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
 
 static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
 static VALUE CNaN, CInfinity, CMinusInfinity;
+static VALUE cBigDecimal = Qundef;
 
 static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
           i_chr, i_max_nesting, i_allow_nan, i_symbolize_names,
-          i_object_class, i_array_class, i_key_p, i_deep_const_get, i_match,
-          i_match_string, i_aset, i_aref, i_leftshift;
+          i_object_class, i_array_class, i_decimal_class, i_key_p,
+          i_deep_const_get, i_match, i_match_string, i_aset, i_aref,
+          i_leftshift, i_new, i_BigDecimal, i_freeze, i_uminus;
 
 %%{
     machine JSON_common;
@@ -136,6 +138,7 @@ static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
             fhold; fbreak;
         } else {
             if (NIL_P(json->object_class)) {
+                OBJ_FREEZE(last_name);
                 rb_hash_aset(*result, last_name, v);
             } else {
                 rb_funcall(*result, i_aset, 2, last_name, v);
@@ -287,6 +290,10 @@ static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *resul
     %% write init;
     %% write exec;
 
+    if (json->freeze) {
+        OBJ_FREEZE(*result);
+    }
+
     if (cs >= JSON_value_first_final) {
         return p;
     } else {
@@ -338,6 +345,19 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
              )  (^[0-9Ee.\-]? @exit );
 }%%
 
+static int is_bigdecimal_class(VALUE obj)
+{
+  if (cBigDecimal == Qundef) {
+    if (rb_const_defined(rb_cObject, i_BigDecimal)) {
+      cBigDecimal = rb_const_get_at(rb_cObject, i_BigDecimal);
+    }
+    else {
+      return 0;
+    }
+  }
+  return obj == cBigDecimal;
+}
+
 static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
@@ -351,7 +371,17 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
         fbuffer_clear(json->fbuffer);
         fbuffer_append(json->fbuffer, json->memo, len);
         fbuffer_append_char(json->fbuffer, '\0');
-        *result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
+        if (NIL_P(json->decimal_class)) {
+          *result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
+        } else {
+          VALUE text;
+          text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
+          if (is_bigdecimal_class(json->decimal_class)) {
+            *result = rb_funcall(Qnil, i_BigDecimal, 1, text);
+          } else {
+            *result = rb_funcall(json->decimal_class, i_new, 1, text);
+          }
+        }
         return p + 1;
     } else {
         return NULL;
@@ -546,8 +576,23 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     if (json->symbolize_names && json->parsing_name) {
       *result = rb_str_intern(*result);
-    } else {
+    } else if (RB_TYPE_P(*result, T_STRING)) {
+# if STR_UMINUS_DEDUPE_FROZEN
+      if (json->freeze) {
+        // Starting from MRI 2.8 it is preferable to freeze the string
+        // before deduplication so that it can be interned directly
+        // otherwise it would be duplicated first which is wasteful.
+        *result = rb_funcall(rb_str_freeze(*result), i_uminus, 0);
+      }
+# elif STR_UMINUS_DEDUPE
+      if (json->freeze) {
+        // MRI 2.5 and older do not deduplicate strings that are already
+        // frozen.
+        *result = rb_funcall(*result, i_uminus, 0);
+      }
+# else
       rb_str_resize(*result, RSTRING_LEN(*result));
+# endif
     }
     if (cs >= JSON_string_first_final) {
         return p + 1;
@@ -655,6 +700,12 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->symbolize_names = 0;
             }
+            tmp = ID2SYM(i_freeze);
+            if (option_given_p(opts, tmp)) {
+                json->freeze = RTEST(rb_hash_aref(opts, tmp)) ? 1 : 0;
+            } else {
+                json->freeze = 0;
+            }
             tmp = ID2SYM(i_create_additions);
             if (option_given_p(opts, tmp)) {
                 json->create_additions = RTEST(rb_hash_aref(opts, tmp));
@@ -684,6 +735,12 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->array_class = Qnil;
             }
+            tmp = ID2SYM(i_decimal_class);
+            if (option_given_p(opts, tmp)) {
+                json->decimal_class = rb_hash_aref(opts, tmp);
+            } else {
+                json->decimal_class = Qnil;
+            }
             tmp = ID2SYM(i_match_string);
             if (option_given_p(opts, tmp)) {
                 VALUE match_string = rb_hash_aref(opts, tmp);
@@ -697,10 +754,11 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
     } else {
         json->max_nesting = 100;
         json->allow_nan = 0;
-        json->create_additions = 1;
+        json->create_additions = 0;
         json->create_id = rb_funcall(mJSON, i_create_id, 0);
         json->object_class = Qnil;
         json->array_class = Qnil;
+        json->decimal_class = Qnil;
     }
     source = convert_encoding(StringValue(source));
     StringValue(source);
@@ -760,6 +818,7 @@ static void JSON_mark(void *ptr)
     rb_gc_mark_maybe(json->create_id);
     rb_gc_mark_maybe(json->object_class);
     rb_gc_mark_maybe(json->array_class);
+    rb_gc_mark_maybe(json->decimal_class);
     rb_gc_mark_maybe(json->match_string);
 }
 
@@ -809,20 +868,28 @@ static VALUE cParser_source(VALUE self)
 
 void Init_parser(void)
 {
+#undef rb_intern
     rb_require("json/common");
     mJSON = rb_define_module("JSON");
     mExt = rb_define_module_under(mJSON, "Ext");
     cParser = rb_define_class_under(mExt, "Parser", rb_cObject);
     eParserError = rb_path2class("JSON::ParserError");
     eNestingError = rb_path2class("JSON::NestingError");
+    rb_gc_register_mark_object(eParserError);
+    rb_gc_register_mark_object(eNestingError);
     rb_define_alloc_func(cParser, cJSON_parser_s_allocate);
     rb_define_method(cParser, "initialize", cParser_initialize, -1);
     rb_define_method(cParser, "parse", cParser_parse, 0);
     rb_define_method(cParser, "source", cParser_source, 0);
 
     CNaN = rb_const_get(mJSON, rb_intern("NaN"));
+    rb_gc_register_mark_object(CNaN);
+
     CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
+    rb_gc_register_mark_object(CInfinity);
+
     CMinusInfinity = rb_const_get(mJSON, rb_intern("MinusInfinity"));
+    rb_gc_register_mark_object(CMinusInfinity);
 
     i_json_creatable_p = rb_intern("json_creatable?");
     i_json_create = rb_intern("json_create");
@@ -834,6 +901,7 @@ void Init_parser(void)
     i_symbolize_names = rb_intern("symbolize_names");
     i_object_class = rb_intern("object_class");
     i_array_class = rb_intern("array_class");
+    i_decimal_class = rb_intern("decimal_class");
     i_match = rb_intern("match");
     i_match_string = rb_intern("match_string");
     i_key_p = rb_intern("key?");
@@ -841,6 +909,10 @@ void Init_parser(void)
     i_aset = rb_intern("[]=");
     i_aref = rb_intern("[]");
     i_leftshift = rb_intern("<<");
+    i_new = rb_intern("new");
+    i_BigDecimal = rb_intern("BigDecimal");
+    i_freeze = rb_intern("freeze");
+    i_uminus = rb_intern("-@");
 }
 
 /*

data/ext/json/extconf.rb

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

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

@@ -7,13 +7,12 @@ 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;
 import org.jruby.RubyFixnum;
 import org.jruby.RubyFloat;
 import org.jruby.RubyHash;
-import org.jruby.RubyNumeric;
 import org.jruby.RubyString;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -30,8 +29,7 @@ public final class Generator {
     static <T extends IRubyObject> RubyString
             generateJson(ThreadContext context, T object,
                          Handler<? super T> handler, IRubyObject[] args) {
-        Session session = new Session(context, args.length > 0 ? args[0]
-                                                               : null);
+        Session session = new Session(context, args.length > 0 ? args[0] : null);
         return session.infect(handler.generateNew(session, object));
     }
 
@@ -41,7 +39,7 @@ public final class Generator {
      */
     static <T extends IRubyObject> RubyString
             generateJson(ThreadContext context, T object, IRubyObject[] args) {
-        Handler<? super T> handler = getHandlerFor(context.getRuntime(), object);
+        Handler<? super T> handler = getHandlerFor(context.runtime, object);
         return generateJson(context, object, handler, args);
     }
 
@@ -53,7 +51,7 @@ public final class Generator {
             generateJson(ThreadContext context, T object,
                          GeneratorState config) {
         Session session = new Session(context, config);
-        Handler<? super T> handler = getHandlerFor(context.getRuntime(), object);
+        Handler<? super T> handler = getHandlerFor(context.runtime, object);
         return handler.generateNew(session, object);
     }
 
@@ -63,18 +61,24 @@ public final class Generator {
     // Java's generics can't handle this satisfactorily, so I'll just leave
     // the best I could get and ignore the warnings
     @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;
+    private static <T extends IRubyObject> Handler<? super T> getHandlerFor(Ruby runtime, T object) {
+        switch (((RubyBasicObject) object).getNativeClassIndex()) {
+            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;
     }
 
@@ -135,7 +139,7 @@ public final class Generator {
 
         public StringEncoder getStringEncoder() {
             if (stringEncoder == null) {
-                stringEncoder = new StringEncoder(context, getState().asciiOnly());
+                stringEncoder = new StringEncoder(context, getState().asciiOnly(), getState().escapeSlash());
             }
             return stringEncoder;
         }
@@ -330,13 +334,13 @@ public final class Generator {
 
                 buffer.append((byte)'{');
                 buffer.append(objectNl);
-                object.visitAll(new RubyHash.Visitor() {
-                    private boolean firstPair = true;
 
+                final boolean[] firstPair = new boolean[]{true};
+                object.visitAll(new RubyHash.Visitor() {
                     @Override
                     public void visit(IRubyObject key, IRubyObject value) {
-                        if (firstPair) {
-                            firstPair = false;
+                        if (firstPair[0]) {
+                            firstPair[0] = false;
                         } else {
                             buffer.append((byte)',');
                             buffer.append(objectNl);
@@ -356,7 +360,7 @@ public final class Generator {
                     }
                 });
                 state.decreaseDepth();
-                if (objectNl.length() != 0) {
+                if (!firstPair[0] && objectNl.length() != 0) {
                     buffer.append(objectNl);
                     buffer.append(Utils.repeat(state.getIndent(), state.getDepth()));
                 }

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

@@ -82,6 +82,12 @@ public class GeneratorState extends RubyObject {
      */
     private boolean quirksMode = DEFAULT_QUIRKS_MODE;
     static final boolean DEFAULT_QUIRKS_MODE = false;
+    /**
+     * If set to <code>true</code> the forward slash will be escaped in
+     * json output.
+     */
+    private boolean escapeSlash = DEFAULT_ESCAPE_SLASH;
+    static final boolean DEFAULT_ESCAPE_SLASH = false;
     /**
      * The initial buffer length of this state. (This isn't really used on all
      * non-C implementations.)
@@ -171,6 +177,9 @@ public class GeneratorState extends RubyObject {
      * <code>-Infinity</code> should be generated, otherwise an exception is
      * thrown if these values are encountered.
      * This options defaults to <code>false</code>.
+     * <dt><code>:escape_slash</code>
+     * <dd>set to <code>true</code> if the forward slashes should be escaped
+     * in the json output (default: <code>false</code>)
      */
     @JRubyMethod(optional=1, visibility=Visibility.PRIVATE)
     public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
@@ -194,6 +203,7 @@ public class GeneratorState extends RubyObject {
         this.allowNaN = orig.allowNaN;
         this.asciiOnly = orig.asciiOnly;
         this.quirksMode = orig.quirksMode;
+        this.escapeSlash = orig.escapeSlash;
         this.bufferInitialLength = orig.bufferInitialLength;
         this.depth = orig.depth;
         return this;
@@ -346,6 +356,24 @@ public class GeneratorState extends RubyObject {
         return max_nesting;
     }
 
+    /**
+     * Returns true if forward slashes are escaped in the json output.
+     */
+    public boolean escapeSlash() {
+        return escapeSlash;
+    }
+
+    @JRubyMethod(name="escape_slash")
+    public RubyBoolean escape_slash_get(ThreadContext context) {
+        return context.getRuntime().newBoolean(escapeSlash);
+    }
+
+    @JRubyMethod(name="escape_slash=")
+    public IRubyObject escape_slash_set(IRubyObject escape_slash) {
+        escapeSlash = escape_slash.isTrue();
+        return escape_slash.getRuntime().newBoolean(escapeSlash);
+    }
+
     public boolean allowNaN() {
         return allowNaN;
     }
@@ -430,6 +458,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);
+        escapeSlash = opts.getBool("escape_slash", DEFAULT_ESCAPE_SLASH);
         bufferInitialLength = opts.getInt("buffer_initial_length", DEFAULT_BUFFER_INITIAL_LENGTH);
 
         depth = opts.getInt("depth", 0);
@@ -457,6 +486,7 @@ public class GeneratorState extends RubyObject {
         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("max_nesting"), max_nesting_get(context));
+        result.op_aset(context, runtime.newSymbol("escape_slash"), escape_slash_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));
         for (String name: getInstanceVariableNameList()) {

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

@@ -52,9 +52,11 @@ public class Parser extends RubyObject {
     private int maxNesting;
     private boolean allowNaN;
     private boolean symbolizeNames;
+    private boolean freeze;
     private RubyClass objectClass;
     private RubyClass arrayClass;
-    private RubyHash matchString;
+    private RubyClass decimalClass;
+    private RubyHash match_string;
 
     private static final int DEFAULT_MAX_NESTING = 100;
 
@@ -133,6 +135,10 @@ public class Parser extends RubyObject {
      * <dt><code>:array_class</code>
      * <dd>Defaults to Array.
      *
+     * <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)
@@ -155,11 +161,13 @@ 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.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.matchString    = opts.getHash("match_string");
+        this.decimalClass    = opts.getClass("decimal_class", null);
+        this.match_string    = opts.getHash("match_string");
 
         if(symbolizeNames && createAdditions) {
           throw runtime.newArgumentError(
@@ -307,11 +315,11 @@ public class Parser extends RubyObject {
         }
 
         
-// line 333 "Parser.rl"
+// line 341 "Parser.rl"
 
 
         
-// line 315 "Parser.java"
+// line 323 "Parser.java"
 private static byte[] init__JSON_value_actions_0()
 {
 	return new byte [] {
@@ -425,7 +433,7 @@ static final int JSON_value_error = 0;
 static final int JSON_value_en_main = 1;
 
 
-// line 439 "Parser.rl"
+// line 447 "Parser.rl"
 
 
         void parseValue(ParserResult res, int p, int pe) {
@@ -433,14 +441,14 @@ static final int JSON_value_en_main = 1;
             IRubyObject result = null;
 
             
-// line 437 "Parser.java"
+// line 445 "Parser.java"
 	{
 	cs = JSON_value_start;
 	}
 
-// line 446 "Parser.rl"
+// line 454 "Parser.rl"
             
-// line 444 "Parser.java"
+// line 452 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -466,13 +474,13 @@ case 1:
 	while ( _nacts-- > 0 ) {
 		switch ( _JSON_value_actions[_acts++] ) {
 	case 9:
-// line 424 "Parser.rl"
+// line 432 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 476 "Parser.java"
+// line 484 "Parser.java"
 		}
 	}
 
@@ -535,25 +543,25 @@ case 1:
 			switch ( _JSON_value_actions[_acts++] )
 			{
 	case 0:
-// line 341 "Parser.rl"
+// line 349 "Parser.rl"
 	{
                 result = getRuntime().getNil();
             }
 	break;
 	case 1:
-// line 344 "Parser.rl"
+// line 352 "Parser.rl"
 	{
                 result = getRuntime().getFalse();
             }
 	break;
 	case 2:
-// line 347 "Parser.rl"
+// line 355 "Parser.rl"
 	{
                 result = getRuntime().getTrue();
             }
 	break;
 	case 3:
-// line 350 "Parser.rl"
+// line 358 "Parser.rl"
 	{
                 if (parser.allowNaN) {
                     result = getConstant(CONST_NAN);
@@ -563,7 +571,7 @@ case 1:
             }
 	break;
 	case 4:
-// line 357 "Parser.rl"
+// line 365 "Parser.rl"
 	{
                 if (parser.allowNaN) {
                     result = getConstant(CONST_INFINITY);
@@ -573,7 +581,7 @@ case 1:
             }
 	break;
 	case 5:
-// line 364 "Parser.rl"
+// line 372 "Parser.rl"
 	{
                 if (pe > p + 8 &&
                     absSubSequence(p, p + 9).equals(JSON_MINUS_INFINITY)) {
@@ -602,7 +610,7 @@ case 1:
             }
 	break;
 	case 6:
-// line 390 "Parser.rl"
+// line 398 "Parser.rl"
 	{
                 parseString(res, p, pe);
                 if (res.result == null) {
@@ -615,7 +623,7 @@ case 1:
             }
 	break;
 	case 7:
-// line 400 "Parser.rl"
+// line 408 "Parser.rl"
 	{
                 currentNesting++;
                 parseArray(res, p, pe);
@@ -630,7 +638,7 @@ case 1:
             }
 	break;
 	case 8:
-// line 412 "Parser.rl"
+// line 420 "Parser.rl"
 	{
                 currentNesting++;
                 parseObject(res, p, pe);
@@ -644,7 +652,7 @@ case 1:
                 }
             }
 	break;
-// line 648 "Parser.java"
+// line 656 "Parser.java"
 			}
 		}
 	}
@@ -664,9 +672,12 @@ case 5:
 	break; }
 	}
 
-// line 447 "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);
@@ -674,7 +685,7 @@ case 5:
         }
 
         
-// line 678 "Parser.java"
+// line 689 "Parser.java"
 private static byte[] init__JSON_integer_actions_0()
 {
 	return new byte [] {
@@ -773,7 +784,7 @@ static final int JSON_integer_error = 0;
 static final int JSON_integer_en_main = 1;
 
 
-// line 466 "Parser.rl"
+// line 477 "Parser.rl"
 
 
         void parseInteger(ParserResult res, int p, int pe) {
@@ -791,15 +802,15 @@ static final int JSON_integer_en_main = 1;
             int cs = EVIL;
 
             
-// line 795 "Parser.java"
+// line 806 "Parser.java"
 	{
 	cs = JSON_integer_start;
 	}
 
-// line 483 "Parser.rl"
+// line 494 "Parser.rl"
             int memo = p;
             
-// line 803 "Parser.java"
+// line 814 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -880,13 +891,13 @@ case 1:
 			switch ( _JSON_integer_actions[_acts++] )
 			{
 	case 0:
-// line 460 "Parser.rl"
+// line 471 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 890 "Parser.java"
+// line 901 "Parser.java"
 			}
 		}
 	}
@@ -906,7 +917,7 @@ case 5:
 	break; }
 	}
 
-// line 485 "Parser.rl"
+// line 496 "Parser.rl"
 
             if (cs < JSON_integer_first_final) {
                 return -1;
@@ -914,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) :
@@ -928,7 +939,7 @@ case 5:
         }
 
         
-// line 932 "Parser.java"
+// line 943 "Parser.java"
 private static byte[] init__JSON_float_actions_0()
 {
 	return new byte [] {
@@ -1030,7 +1041,7 @@ static final int JSON_float_error = 0;
 static final int JSON_float_en_main = 1;
 
 
-// line 520 "Parser.rl"
+// line 531 "Parser.rl"
 
 
         void parseFloat(ParserResult res, int p, int pe) {
@@ -1039,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;
         }
@@ -1048,15 +1061,15 @@ static final int JSON_float_en_main = 1;
             int cs = EVIL;
 
             
-// line 1052 "Parser.java"
+// line 1065 "Parser.java"
 	{
 	cs = JSON_float_start;
 	}
 
-// line 537 "Parser.rl"
+// line 550 "Parser.rl"
             int memo = p;
             
-// line 1060 "Parser.java"
+// line 1073 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1137,13 +1150,13 @@ case 1:
 			switch ( _JSON_float_actions[_acts++] )
 			{
 	case 0:
-// line 511 "Parser.rl"
+// line 522 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1147 "Parser.java"
+// line 1160 "Parser.java"
 			}
 		}
 	}
@@ -1163,23 +1176,30 @@ case 5:
 	break; }
 	}
 
-// line 539 "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 1183 "Parser.java"
+// line 1203 "Parser.java"
 private static byte[] init__JSON_string_actions_0()
 {
 	return new byte [] {
@@ -1281,7 +1301,7 @@ static final int JSON_string_error = 0;
 static final int JSON_string_en_main = 1;
 
 
-// line 584 "Parser.rl"
+// line 604 "Parser.rl"
 
 
         void parseString(ParserResult res, int p, int pe) {
@@ -1289,15 +1309,15 @@ static final int JSON_string_en_main = 1;
             IRubyObject result = null;
 
             
-// line 1293 "Parser.java"
+// line 1313 "Parser.java"
 	{
 	cs = JSON_string_start;
 	}
 
-// line 591 "Parser.rl"
+// line 611 "Parser.rl"
             int memo = p;
             
-// line 1301 "Parser.java"
+// line 1321 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1378,7 +1398,7 @@ case 1:
 			switch ( _JSON_string_actions[_acts++] )
 			{
 	case 0:
-// line 559 "Parser.rl"
+// line 579 "Parser.rl"
 	{
                 int offset = byteList.begin();
                 ByteList decoded = decoder.decode(byteList, memo + 1 - offset,
@@ -1393,13 +1413,13 @@ case 1:
             }
 	break;
 	case 1:
-// line 572 "Parser.rl"
+// line 592 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1403 "Parser.java"
+// line 1423 "Parser.java"
 			}
 		}
 	}
@@ -1419,10 +1439,10 @@ case 5:
 	break; }
 	}
 
-// line 593 "Parser.rl"
+// line 613 "Parser.rl"
 
             if (parser.createAdditions) {
-                RubyHash matchString = parser.matchString;
+                RubyHash matchString = parser.match_string;
                 if (matchString != null) {
                     final IRubyObject[] memoArray = { result, null };
                     try {
@@ -1446,18 +1466,25 @@ case 5:
                 }
             }
 
-            if (cs >= JSON_string_first_final && result != null) {                
+            if (cs >= JSON_string_first_final && result != null) {
                 if (result instanceof RubyString) {
-                  ((RubyString)result).force_encoding(context, info.utf8.get());
+                  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 1461 "Parser.java"
+// line 1488 "Parser.java"
 private static byte[] init__JSON_array_actions_0()
 {
 	return new byte [] {
@@ -1570,7 +1597,7 @@ static final int JSON_array_error = 0;
 static final int JSON_array_en_main = 1;
 
 
-// line 666 "Parser.rl"
+// line 693 "Parser.rl"
 
 
         void parseArray(ParserResult res, int p, int pe) {
@@ -1590,14 +1617,14 @@ static final int JSON_array_en_main = 1;
             }
 
             
-// line 1594 "Parser.java"
+// line 1621 "Parser.java"
 	{
 	cs = JSON_array_start;
 	}
 
-// line 685 "Parser.rl"
+// line 712 "Parser.rl"
             
-// line 1601 "Parser.java"
+// line 1628 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1678,7 +1705,7 @@ case 1:
 			switch ( _JSON_array_actions[_acts++] )
 			{
 	case 0:
-// line 635 "Parser.rl"
+// line 662 "Parser.rl"
 	{
                 parseValue(res, p, pe);
                 if (res.result == null) {
@@ -1695,13 +1722,13 @@ case 1:
             }
 	break;
 	case 1:
-// line 650 "Parser.rl"
+// line 677 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 1705 "Parser.java"
+// line 1732 "Parser.java"
 			}
 		}
 	}
@@ -1721,7 +1748,7 @@ case 5:
 	break; }
 	}
 
-// line 686 "Parser.rl"
+// line 713 "Parser.rl"
 
             if (cs >= JSON_array_first_final) {
                 res.update(result, p + 1);
@@ -1731,7 +1758,7 @@ case 5:
         }
 
         
-// line 1735 "Parser.java"
+// line 1762 "Parser.java"
 private static byte[] init__JSON_object_actions_0()
 {
 	return new byte [] {
@@ -1854,7 +1881,7 @@ static final int JSON_object_error = 0;
 static final int JSON_object_en_main = 1;
 
 
-// line 745 "Parser.rl"
+// line 772 "Parser.rl"
 
 
         void parseObject(ParserResult res, int p, int pe) {
@@ -1879,14 +1906,14 @@ static final int JSON_object_en_main = 1;
             }
 
             
-// line 1883 "Parser.java"
+// line 1910 "Parser.java"
 	{
 	cs = JSON_object_start;
 	}
 
-// line 769 "Parser.rl"
+// line 796 "Parser.rl"
             
-// line 1890 "Parser.java"
+// line 1917 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1967,7 +1994,7 @@ case 1:
 			switch ( _JSON_object_actions[_acts++] )
 			{
 	case 0:
-// line 700 "Parser.rl"
+// line 727 "Parser.rl"
 	{
                 parseValue(res, p, pe);
                 if (res.result == null) {
@@ -1984,7 +2011,7 @@ case 1:
             }
 	break;
 	case 1:
-// line 715 "Parser.rl"
+// line 742 "Parser.rl"
 	{
                 parseString(res, p, pe);
                 if (res.result == null) {
@@ -2004,13 +2031,13 @@ case 1:
             }
 	break;
 	case 2:
-// line 733 "Parser.rl"
+// line 760 "Parser.rl"
 	{
                 p--;
                 { p += 1; _goto_targ = 5; if (true)  continue _goto;}
             }
 	break;
-// line 2014 "Parser.java"
+// line 2041 "Parser.java"
 			}
 		}
 	}
@@ -2030,7 +2057,7 @@ case 5:
 	break; }
 	}
 
-// line 770 "Parser.rl"
+// line 797 "Parser.rl"
 
             if (cs < JSON_object_first_final) {
                 res.update(null, p + 1);
@@ -2063,7 +2090,7 @@ case 5:
         }
 
         
-// line 2067 "Parser.java"
+// line 2094 "Parser.java"
 private static byte[] init__JSON_actions_0()
 {
 	return new byte [] {
@@ -2166,7 +2193,7 @@ static final int JSON_error = 0;
 static final int JSON_en_main = 1;
 
 
-// line 821 "Parser.rl"
+// line 848 "Parser.rl"
 
 
         public IRubyObject parseImplemetation() {
@@ -2176,16 +2203,16 @@ static final int JSON_en_main = 1;
             ParserResult res = new ParserResult();
 
             
-// line 2180 "Parser.java"
+// line 2207 "Parser.java"
 	{
 	cs = JSON_start;
 	}
 
-// line 830 "Parser.rl"
+// line 857 "Parser.rl"
             p = byteList.begin();
             pe = p + byteList.length();
             
-// line 2189 "Parser.java"
+// line 2216 "Parser.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -2266,7 +2293,7 @@ case 1:
 			switch ( _JSON_actions[_acts++] )
 			{
 	case 0:
-// line 807 "Parser.rl"
+// line 834 "Parser.rl"
 	{
                 parseValue(res, p, pe);
                 if (res.result == null) {
@@ -2278,7 +2305,7 @@ case 1:
                 }
             }
 	break;
-// line 2282 "Parser.java"
+// line 2309 "Parser.java"
 			}
 		}
 	}
@@ -2298,7 +2325,7 @@ case 5:
 	break; }
 	}
 
-// line 833 "Parser.rl"
+// line 860 "Parser.rl"
 
             if (cs >= JSON_first_final && p == pe) {
                 return result;