diff options
Diffstat (limited to 'dev-ruby/json/files/json-2.1.0-ruby26-3.patch')
| -rw-r--r-- | dev-ruby/json/files/json-2.1.0-ruby26-3.patch | 143 |
1 files changed, 143 insertions, 0 deletions
diff --git a/dev-ruby/json/files/json-2.1.0-ruby26-3.patch b/dev-ruby/json/files/json-2.1.0-ruby26-3.patch new file mode 100644 index 000000000000..cf16e235216c --- /dev/null +++ b/dev-ruby/json/files/json-2.1.0-ruby26-3.patch @@ -0,0 +1,143 @@ +commit a7e3516ff1116a15b3ed62f55143eceee27c4ce9 +Author: mrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> +Date: Sun Dec 2 05:21:57 2018 +0000 + + Fix JSON::Parser against bigdecimal updates + + git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e + +diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c +index c8012796a4..b02aae8fb9 100644 +--- a/ext/json/ext/parser/parser.c ++++ b/ext/json/ext/parser/parser.c +@@ -91,12 +91,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_decimal_class, i_key_p, + i_deep_const_get, i_match, i_match_string, i_aset, i_aref, +- i_leftshift, i_new; ++ i_leftshift, i_new, i_BigDecimal; + + + #line 125 "parser.rl" +@@ -985,6 +986,19 @@ enum {JSON_float_en_main = 1}; + #line 340 "parser.rl" + + ++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; +@@ -1136,7 +1150,11 @@ case 7: + } else { + VALUE text; + text = rb_str_new2(FBUFFER_PTR(json->fbuffer)); +- *result = rb_funcall(json->decimal_class, i_new, 1, text); ++ 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 { +@@ -2101,6 +2119,7 @@ void Init_parser(void) + i_aref = rb_intern("[]"); + i_leftshift = rb_intern("<<"); + i_new = rb_intern("new"); ++ i_BigDecimal = rb_intern("BigDecimal"); + } + + /* +diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl +index edab32b78f..d4e7a60e9d 100644 +--- a/ext/json/ext/parser/parser.rl ++++ b/ext/json/ext/parser/parser.rl +@@ -89,12 +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_decimal_class, i_key_p, + i_deep_const_get, i_match, i_match_string, i_aset, i_aref, +- i_leftshift, i_new; ++ i_leftshift, i_new, i_BigDecimal; + + %%{ + machine JSON_common; +@@ -339,6 +340,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; +@@ -357,7 +371,11 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul + } else { + VALUE text; + text = rb_str_new2(FBUFFER_PTR(json->fbuffer)); +- *result = rb_funcall(json->decimal_class, i_new, 1, text); ++ 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 { +@@ -861,6 +879,7 @@ void Init_parser(void) + i_aref = rb_intern("[]"); + i_leftshift = rb_intern("<<"); + i_new = rb_intern("new"); ++ i_BigDecimal = rb_intern("BigDecimal"); + } + + /* +diff --git a/test/json/json_parser_test.rb b/test/json/json_parser_test.rb +index 5f454eb121..68aeb572bb 100644 +--- a/tests/json_parser_test.rb ++++ b/tests/json_parser_test.rb +@@ -110,8 +110,8 @@ def test_parse_numbers + end + + def test_parse_bigdecimals +- assert_equal(BigDecimal, JSON.parse('{"foo": 9.01234567890123456789}', decimal_class: BigDecimal)["foo"].class) +- assert_equal(BigDecimal.new("0.901234567890123456789E1"),JSON.parse('{"foo": 9.01234567890123456789}', decimal_class: BigDecimal)["foo"] ) ++ assert_equal(BigDecimal, JSON.parse('{"foo": 9.01234567890123456789}', decimal_class: BigDecimal)["foo"].class) ++ assert_equal(BigDecimal("0.901234567890123456789E1"),JSON.parse('{"foo": 9.01234567890123456789}', decimal_class: BigDecimal)["foo"] ) + end + + if Array.method_defined?(:permutation) |