diff options
author | Kenta Murata <mrkn@mrkn.jp> | 2018-12-02 14:26:15 +0900 |
---|---|---|
committer | Florian Frank <flori@ping.de> | 2019-02-21 23:12:31 +0100 |
commit | ef2092f4d288ff666bcf10ffa43e58a91c649293 (patch) | |
tree | 62a31a028bb76dad7c531f77952a204668d6d3ef /ext/json/ext/parser/parser.c | |
parent | 409f8f6995a5f9f805b2b604464a8ef032f71291 (diff) | |
download | json-ef2092f4d288ff666bcf10ffa43e58a91c649293.tar.gz |
Fix for bigdecimal updates
`BigDecimal.new` is no longer available from bigdecimal-1.4.0.
Diffstat (limited to 'ext/json/ext/parser/parser.c')
-rw-r--r-- | ext/json/ext/parser/parser.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/ext/json/ext/parser/parser.c b/ext/json/ext/parser/parser.c index f41aac5..595845b 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,18 @@ 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 +1149,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 { |