Skip to content

Commit 9e73da3

Browse files
hsbthsbt
authored
Merge pull request #457 from flori/prepare-3.0
Prepare to release Ruby 3.0
2 parents 1bd46c4 + 0c446fa commit 9e73da3

File tree

12 files changed

+1317
-111
lines changed

12 files changed

+1317
-111
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ language: ruby
44

55
# Specify which ruby versions you wish to run your tests on, each version will be used
66
rvm:
7-
- 2.1
8-
- 2.2
97
- 2.3
108
- 2.4
119
- 2.5
1210
- 2.6
13-
- 2.7.0-preview3
11+
- 2.7
1412
- ruby-head
1513
- jruby-9.1 # Ruby 2.3
1614
- jruby-9.2 # Ruby 2.5

‎Rakefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ task(:set_env_pure) { ENV['JSON'] = 'pure' }
9999

100100
UndocumentedTestTask.new do |t|
101101
t.name = 'do_test_pure'
102-
t.libs << 'lib' << 'tests'
102+
t.libs << 'lib' << 'tests' << 'tests/lib'
103+
t.ruby_opts << "-rhelper"
103104
t.test_files = FileList['tests/*_test.rb']
104105
t.verbose = true
105106
t.options = '-v'
@@ -252,7 +253,8 @@ else
252253

253254
UndocumentedTestTask.new do |t|
254255
t.name = 'do_test_ext'
255-
t.libs << 'ext' << 'lib' << 'tests'
256+
t.libs << 'lib' << 'tests' << "tests/lib"
257+
t.ruby_opts << '-rhelper'
256258
t.test_files = FileList['tests/*_test.rb']
257259
t.verbose = true
258260
t.options = '-v'

‎ext/json/ext/generator/generator.c‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
1515
#endif
1616
mFloat, mString, mString_Extend,
1717
mTrueClass, mFalseClass, mNilClass, eGeneratorError,
18-
eNestingError,
19-
i_SAFE_STATE_PROTOTYPE;
18+
eNestingError;
2019

2120
static ID i_to_s, i_to_json, i_new, i_indent, i_space, i_space_before,
2221
i_object_nl, i_array_nl, i_max_nesting, i_allow_nan, i_ascii_only,
@@ -620,13 +619,18 @@ static size_t State_memsize(const void *ptr)
620619
return size;
621620
}
622621

622+
#ifndef HAVE_RB_EXT_RACTOR_SAFE
623+
# undef RUBY_TYPED_FROZEN_SHAREABLE
624+
# define RUBY_TYPED_FROZEN_SHAREABLE 0
625+
#endif
626+
623627
#ifdef NEW_TYPEDDATA_WRAPPER
624628
static const rb_data_type_t JSON_Generator_State_type = {
625629
"JSON/Generator/State",
626630
{NULL, State_free, State_memsize,},
627631
#ifdef RUBY_TYPED_FREE_IMMEDIATELY
628632
0, 0,
629-
RUBY_TYPED_FREE_IMMEDIATELY,
633+
RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_FROZEN_SHAREABLE,
630634
#endif
631635
};
632636
#endif
@@ -1166,8 +1170,7 @@ static VALUE cState_from_state_s(VALUE self, VALUE opts)
11661170
} else if (rb_obj_is_kind_of(opts, rb_cHash)) {
11671171
return rb_funcall(self, i_new, 1, opts);
11681172
} else {
1169-
VALUE prototype = rb_const_get(mJSON, i_SAFE_STATE_PROTOTYPE);
1170-
return rb_funcall(prototype, i_dup, 0);
1173+
return rb_class_new_instance(0, NULL, cState);
11711174
}
11721175
}
11731176

@@ -1499,6 +1502,10 @@ static VALUE cState_buffer_initial_length_set(VALUE self, VALUE buffer_initial_l
14991502
*/
15001503
void Init_generator(void)
15011504
{
1505+
#ifdef HAVE_RB_EXT_RACTOR_SAFE
1506+
rb_ext_ractor_safe(true);
1507+
#endif
1508+
15021509
#undef rb_intern
15031510
rb_require("json/common");
15041511

@@ -1608,5 +1615,4 @@ void Init_generator(void)
16081615
i_encoding = rb_intern("encoding");
16091616
i_encode = rb_intern("encode");
16101617
#endif
1611-
i_SAFE_STATE_PROTOTYPE = rb_intern("SAFE_STATE_PROTOTYPE");
16121618
}

‎ext/json/ext/parser/parser.c‎

Lines changed: 40 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,12 @@ static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
9191

9292
static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
9393
static VALUE CNaN, CInfinity, CMinusInfinity;
94-
static VALUE cBigDecimal = Qundef;
9594

9695
static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
9796
i_chr, i_max_nesting, i_allow_nan, i_symbolize_names,
9897
i_object_class, i_array_class, i_decimal_class, i_key_p,
9998
i_deep_const_get, i_match, i_match_string, i_aset, i_aref,
100-
i_leftshift, i_new, i_BigDecimal, i_freeze, i_uminus;
99+
i_leftshift, i_new, i_try_convert, i_freeze, i_uminus;
101100

102101

103102
#line 126 "parser.rl"
@@ -991,19 +990,6 @@ enum {JSON_float_en_main = 1};
991990
#line 346 "parser.rl"
992991

993992

994-
static int is_bigdecimal_class(VALUE obj)
995-
{
996-
if (cBigDecimal == Qundef) {
997-
if (rb_const_defined(rb_cObject, i_BigDecimal)) {
998-
cBigDecimal = rb_const_get_at(rb_cObject, i_BigDecimal);
999-
}
1000-
else {
1001-
return 0;
1002-
}
1003-
}
1004-
return obj == cBigDecimal;
1005-
}
1006-
1007993
static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
1008994
{
1009995
int cs = EVIL;
@@ -1146,21 +1132,46 @@ case 7:
11461132
#line 368 "parser.rl"
11471133

11481134
if (cs >= JSON_float_first_final) {
1135+
VALUE mod = Qnil;
1136+
ID method_id = 0;
1137+
if (rb_respond_to(json->decimal_class, i_try_convert)) {
1138+
mod = json->decimal_class;
1139+
method_id = i_try_convert;
1140+
} else if (rb_respond_to(json->decimal_class, i_new)) {
1141+
mod = json->decimal_class;
1142+
method_id = i_new;
1143+
} else if (RB_TYPE_P(json->decimal_class, T_CLASS)) {
1144+
VALUE name = rb_class_name(json->decimal_class);
1145+
const char *name_cstr = RSTRING_PTR(name);
1146+
const char *last_colon = strrchr(name_cstr, ':');
1147+
if (last_colon) {
1148+
const char *mod_path_end = last_colon - 1;
1149+
VALUE mod_path = rb_str_substr(name, 0, mod_path_end - name_cstr);
1150+
mod = rb_path_to_class(mod_path);
1151+
1152+
const char *method_name_beg = last_colon + 1;
1153+
long before_len = method_name_beg - name_cstr;
1154+
long len = RSTRING_LEN(name) - before_len;
1155+
VALUE method_name = rb_str_substr(name, before_len, len);
1156+
method_id = SYM2ID(rb_str_intern(method_name));
1157+
} else {
1158+
mod = rb_mKernel;
1159+
method_id = SYM2ID(rb_str_intern(name));
1160+
}
1161+
}
1162+
11491163
long len = p - json->memo;
11501164
fbuffer_clear(json->fbuffer);
11511165
fbuffer_append(json->fbuffer, json->memo, len);
11521166
fbuffer_append_char(json->fbuffer, '\0');
1153-
if (NIL_P(json->decimal_class)) {
1154-
*result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
1167+
1168+
if (method_id) {
1169+
VALUE text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
1170+
*result = rb_funcallv(mod, method_id, 1, &text);
11551171
} else {
1156-
VALUE text;
1157-
text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
1158-
if (is_bigdecimal_class(json->decimal_class)) {
1159-
*result = rb_funcall(Qnil, i_BigDecimal, 1, text);
1160-
} else {
1161-
*result = rb_funcall(json->decimal_class, i_new, 1, text);
1162-
}
1172+
*result = DBL2NUM(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
11631173
}
1174+
11641175
return p + 1;
11651176
} else {
11661177
return NULL;
@@ -2108,6 +2119,10 @@ static VALUE cParser_source(VALUE self)
21082119

21092120
void Init_parser(void)
21102121
{
2122+
#ifdef HAVE_RB_EXT_RACTOR_SAFE
2123+
rb_ext_ractor_safe(true);
2124+
#endif
2125+
21112126
#undef rb_intern
21122127
rb_require("json/common");
21132128
mJSON = rb_define_module("JSON");
@@ -2150,7 +2165,7 @@ void Init_parser(void)
21502165
i_aref = rb_intern("[]");
21512166
i_leftshift = rb_intern("<<");
21522167
i_new = rb_intern("new");
2153-
i_BigDecimal = rb_intern("BigDecimal");
2168+
i_try_convert = rb_intern("try_convert");
21542169
i_freeze = rb_intern("freeze");
21552170
i_uminus = rb_intern("-@");
21562171
}

‎ext/json/ext/parser/parser.rl‎

Lines changed: 40 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,12 @@ static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
8989

9090
static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
9191
static VALUE CNaN, CInfinity, CMinusInfinity;
92-
static VALUE cBigDecimal = Qundef;
9392

9493
static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
9594
i_chr, i_max_nesting, i_allow_nan, i_symbolize_names,
9695
i_object_class, i_array_class, i_decimal_class, i_key_p,
9796
i_deep_const_get, i_match, i_match_string, i_aset, i_aref,
98-
i_leftshift, i_new, i_BigDecimal, i_freeze, i_uminus;
97+
i_leftshift, i_new, i_try_convert, i_freeze, i_uminus;
9998

10099
%%{
101100
machine JSON_common;
@@ -345,19 +344,6 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
345344
) (^[0-9Ee.\-]? @exit );
346345
}%%
347346

348-
static int is_bigdecimal_class(VALUE obj)
349-
{
350-
if (cBigDecimal == Qundef) {
351-
if (rb_const_defined(rb_cObject, i_BigDecimal)) {
352-
cBigDecimal = rb_const_get_at(rb_cObject, i_BigDecimal);
353-
}
354-
else {
355-
return 0;
356-
}
357-
}
358-
return obj == cBigDecimal;
359-
}
360-
361347
static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
362348
{
363349
int cs = EVIL;
@@ -367,21 +353,46 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
367353
%% write exec;
368354

369355
if (cs >= JSON_float_first_final) {
356+
VALUE mod = Qnil;
357+
ID method_id = 0;
358+
if (rb_respond_to(json->decimal_class, i_try_convert)) {
359+
mod = json->decimal_class;
360+
method_id = i_try_convert;
361+
} else if (rb_respond_to(json->decimal_class, i_new)) {
362+
mod = json->decimal_class;
363+
method_id = i_new;
364+
} else if (RB_TYPE_P(json->decimal_class, T_CLASS)) {
365+
VALUE name = rb_class_name(json->decimal_class);
366+
const char *name_cstr = RSTRING_PTR(name);
367+
const char *last_colon = strrchr(name_cstr, ':');
368+
if (last_colon) {
369+
const char *mod_path_end = last_colon - 1;
370+
VALUE mod_path = rb_str_substr(name, 0, mod_path_end - name_cstr);
371+
mod = rb_path_to_class(mod_path);
372+
373+
const char *method_name_beg = last_colon + 1;
374+
long before_len = method_name_beg - name_cstr;
375+
long len = RSTRING_LEN(name) - before_len;
376+
VALUE method_name = rb_str_substr(name, before_len, len);
377+
method_id = SYM2ID(rb_str_intern(method_name));
378+
} else {
379+
mod = rb_mKernel;
380+
method_id = SYM2ID(rb_str_intern(name));
381+
}
382+
}
383+
370384
long len = p - json->memo;
371385
fbuffer_clear(json->fbuffer);
372386
fbuffer_append(json->fbuffer, json->memo, len);
373387
fbuffer_append_char(json->fbuffer, '\0');
374-
if (NIL_P(json->decimal_class)) {
375-
*result = rb_float_new(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
388+
389+
if (method_id) {
390+
VALUE text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
391+
*result = rb_funcallv(mod, method_id, 1, &text);
376392
} else {
377-
VALUE text;
378-
text = rb_str_new2(FBUFFER_PTR(json->fbuffer));
379-
if (is_bigdecimal_class(json->decimal_class)) {
380-
*result = rb_funcall(Qnil, i_BigDecimal, 1, text);
381-
} else {
382-
*result = rb_funcall(json->decimal_class, i_new, 1, text);
383-
}
393+
*result = DBL2NUM(rb_cstr_to_dbl(FBUFFER_PTR(json->fbuffer), 1));
384394
}
395+
385396
return p + 1;
386397
} else {
387398
return NULL;
@@ -868,6 +879,10 @@ static VALUE cParser_source(VALUE self)
868879

869880
void Init_parser(void)
870881
{
882+
#ifdef HAVE_RB_EXT_RACTOR_SAFE
883+
rb_ext_ractor_safe(true);
884+
#endif
885+
871886
#undef rb_intern
872887
rb_require("json/common");
873888
mJSON = rb_define_module("JSON");
@@ -910,7 +925,7 @@ void Init_parser(void)
910925
i_aref = rb_intern("[]");
911926
i_leftshift = rb_intern("<<");
912927
i_new = rb_intern("new");
913-
i_BigDecimal = rb_intern("BigDecimal");
928+
i_try_convert = rb_intern("try_convert");
914929
i_freeze = rb_intern("freeze");
915930
i_uminus = rb_intern("-@");
916931
}

0 commit comments

Comments
 (0)