1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Generator::State#_generate

Browse Source 
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
This commit is contained in:
Étienne Barrié 2025-01-13 11:28:06 +01:00 committed by Hiroshi SHIBATA
parent 1fae0d7256
commit f301383cdd
Notes: git 2025-01-14 03:24:58 +00:00 
Merged: https://github.com/ruby/ruby/pull/12568
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ext/json/generator/generator.c
View File

@ -1068,8 +1068,19 @@ static VALUE cState_partial_generate(VALUE self, VALUE obj, generator_func func,
return fbuffer_finalize(&buffer); return fbuffer_finalize(&buffer);
} }
static VALUE cState_generate(VALUE self, VALUE obj, VALUE io) /* call-seq:
* generate(obj) -> String
* generate(obj, anIO) -> anIO
*
* Generates a valid JSON document from object +obj+ and returns the
* result. If no valid JSON document can be created this method raises a
* GeneratorError exception.
*/
static VALUE cState_generate(int argc, VALUE *argv, VALUE self)
{ {
rb_check_arity(argc, 1, 2);
VALUE obj = argv[0];
VALUE io = argc > 1 ? argv[1] : Qnil;
VALUE result = cState_partial_generate(self, obj, generate_json, io); VALUE result = cState_partial_generate(self, obj, generate_json, io);
GET_STATE(self); GET_STATE(self);
(void)state; (void)state;
@ -1582,7 +1593,7 @@ void Init_generator(void)
rb_define_method(cState, "depth=", cState_depth_set, 1); rb_define_method(cState, "depth=", cState_depth_set, 1);
rb_define_method(cState, "buffer_initial_length", cState_buffer_initial_length, 0); rb_define_method(cState, "buffer_initial_length", cState_buffer_initial_length, 0);
rb_define_method(cState, "buffer_initial_length=", cState_buffer_initial_length_set, 1); rb_define_method(cState, "buffer_initial_length=", cState_buffer_initial_length_set, 1);
rb_define_private_method(cState, "_generate", cState_generate, 2); rb_define_method(cState, "generate", cState_generate, -1);
rb_define_singleton_method(cState, "generate", cState_m_generate, 3); rb_define_singleton_method(cState, "generate", cState_m_generate, 3);

6
ext/json/lib/json/common.rb
View File

@ -818,11 +818,7 @@ module JSON
opts = merge_dump_options(opts, **kwargs) if kwargs opts = merge_dump_options(opts, **kwargs) if kwargs
begin begin
if State === opts State.generate(obj, opts, anIO)
opts.generate(obj, anIO)
else
State.generate(obj, opts, anIO)
end
rescue JSON::NestingError rescue JSON::NestingError
raise ArgumentError, "exceed depth limit" raise ArgumentError, "exceed depth limit"
end end

11
ext/json/lib/json/ext/generator/state.rb
View File

@ -47,17 +47,6 @@ module JSON
alias_method :merge, :configure alias_method :merge, :configure
# call-seq:
# generate(obj) -> String
# generate(obj, anIO) -> anIO
#
# Generates a valid JSON document from object +obj+ and returns the
# result. If no valid JSON document can be created this method raises a
# GeneratorError exception.
def generate(obj, io = nil)
_generate(obj, io)
end
# call-seq: to_h # call-seq: to_h
# #
# Returns the configuration instance variables as a hash, that can be # Returns the configuration instance variables as a hash, that can be