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

struct.c: don't explain implementation details

Browse Source 
of keyword_init option. [DOC] [ci skip]

It's implemented to take Hash, but it's just implementation detail and
it's intended to behave in the same way as keyword arguments (for
:keyword_init option too).

Also I unified coding style of r61137 with other places.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61182 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2017-12-12 15:12:05 +00:00
parent 8411f58ed7
commit 2406207cbb
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
struct.c
View File

@ -475,7 +475,8 @@ rb_struct_define_under(VALUE outer, const char *name, ...)
* Customer.new("Dave", "123 Main") * Customer.new("Dave", "123 Main")
* #=> #<struct Customer name="Dave", address="123 Main"> * #=> #<struct Customer name="Dave", address="123 Main">
* *
* If keyword_init: true option is given, .new takes Hash instead of Array. * If keyword_init: true option is given, .new takes keyword arguments instead
* of normal arguments.
* *
* Customer = Struct.new(:name, :address, keyword_init: true) * Customer = Struct.new(:name, :address, keyword_init: true)
* #=> Customer * #=> Customer
@ -536,7 +537,8 @@ rb_struct_s_def(int argc, VALUE *argv, VALUE klass)
rb_get_kwargs(argv[argc-1], keyword_ids, 0, 1, kwargs); rb_get_kwargs(argv[argc-1], keyword_ids, 0, 1, kwargs);
--argc; --argc;
keyword_init = kwargs[0]; keyword_init = kwargs[0];
} else { }
else {
keyword_init = Qfalse; keyword_init = Qfalse;
} }
@ -599,7 +601,8 @@ struct_hash_set_i(VALUE key, VALUE val, VALUE arg)
args->unknown_keywords = rb_ary_new(); args->unknown_keywords = rb_ary_new();
} }
rb_ary_push(args->unknown_keywords, key); rb_ary_push(args->unknown_keywords, key);
} else { }
else {
rb_struct_modify(args->self); rb_struct_modify(args->self);
RSTRUCT_SET(args->self, i, val); RSTRUCT_SET(args->self, i, val);
} }
@ -627,7 +630,8 @@ rb_struct_initialize_m(int argc, const VALUE *argv, VALUE self)
rb_raise(rb_eArgError, "unknown keywords: %s", rb_raise(rb_eArgError, "unknown keywords: %s",
RSTRING_PTR(rb_ary_join(arg.unknown_keywords, rb_str_new2(", ")))); RSTRING_PTR(rb_ary_join(arg.unknown_keywords, rb_str_new2(", "))));
} }
} else { }
else {
if (n < argc) { if (n < argc) {
rb_raise(rb_eArgError, "struct size differs"); rb_raise(rb_eArgError, "struct size differs");
} }