diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/json/ext/parser.c | 5 | ||||
| -rw-r--r-- | ext/json/ext/parser.rl | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ext/json/ext/parser.c b/ext/json/ext/parser.c index 2272fa2..0dadf74 100644 --- a/ext/json/ext/parser.c +++ b/ext/json/ext/parser.c @@ -79,7 +79,7 @@ static VALUE CNaN, CInfinity, CMinusInfinity; static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions, i_chr, i_max_nesting, i_allow_nan, i_symbolize_names, i_object_class, - i_array_class, i_key_p; + i_array_class, i_key_p, i_deep_const_get; #line 108 "parser.rl" @@ -440,7 +440,7 @@ case 26: if (RTEST(json->create_id)) { VALUE klassname = rb_hash_aref(*result, json->create_id); if (!NIL_P(klassname)) { - VALUE klass = rb_path2class(StringValueCStr(klassname)); + VALUE klass = rb_funcall(mJSON, i_deep_const_get, 1, klassname); if RTEST(rb_funcall(klass, i_json_creatable_p, 0)) { *result = rb_funcall(klass, i_json_create, 1, *result); } @@ -1914,6 +1914,7 @@ void Init_parser() i_object_class = rb_intern("object_class"); i_array_class = rb_intern("array_class"); i_key_p = rb_intern("key?"); + i_deep_const_get = rb_intern("deep_const_get"); #ifdef HAVE_RUBY_ENCODING_H CEncoding_UTF_8 = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-8")); CEncoding_UTF_16BE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-16be")); diff --git a/ext/json/ext/parser.rl b/ext/json/ext/parser.rl index 012ca31..6e196cf 100644 --- a/ext/json/ext/parser.rl +++ b/ext/json/ext/parser.rl @@ -77,7 +77,7 @@ static VALUE CNaN, CInfinity, CMinusInfinity; static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions, i_chr, i_max_nesting, i_allow_nan, i_symbolize_names, i_object_class, - i_array_class, i_key_p; + i_array_class, i_key_p, i_deep_const_get; %%{ machine JSON_common; @@ -161,7 +161,7 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu if (RTEST(json->create_id)) { VALUE klassname = rb_hash_aref(*result, json->create_id); if (!NIL_P(klassname)) { - VALUE klass = rb_path2class(StringValueCStr(klassname)); + VALUE klass = rb_funcall(mJSON, i_deep_const_get, 1, klassname); if RTEST(rb_funcall(klass, i_json_creatable_p, 0)) { *result = rb_funcall(klass, i_json_create, 1, *result); } @@ -771,6 +771,7 @@ void Init_parser() i_object_class = rb_intern("object_class"); i_array_class = rb_intern("array_class"); i_key_p = rb_intern("key?"); + i_deep_const_get = rb_intern("deep_const_get"); #ifdef HAVE_RUBY_ENCODING_H CEncoding_UTF_8 = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-8")); CEncoding_UTF_16BE = rb_funcall(rb_path2class("Encoding"), rb_intern("find"), 1, rb_str_new2("utf-16be")); |