kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

vm_args.c: split make_unused_kw_hash

Browse source 
* vm_args.c (make_unknown_kw_hash, make_rest_kw_hash): split
  make_unused_kw_hash for key_only parameter.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-09-25 14:48:22 +00:00
parent 76a3f0ca2e
commit 7f6a2e4a60
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
vm_args.c
View file

@ -347,19 +347,28 @@ args_setup_rest_parameter(struct args_info *args, VALUE *locals)
} }
static VALUE static VALUE
make_unused_kw_hash(const VALUE *passed_keywords, int passed_keyword_len, const VALUE *kw_argv, const int key_only) make_unknown_kw_hash(const VALUE *passed_keywords, int passed_keyword_len, const VALUE *kw_argv)
{ {
int i; int i;
VALUE obj = key_only ? rb_ary_tmp_new(1) : rb_hash_new(); VALUE obj = rb_ary_tmp_new(1);
for (i=0; i<passed_keyword_len; i++) { for (i=0; i<passed_keyword_len; i++) {
if (kw_argv[i] != Qundef) { if (kw_argv[i] != Qundef) {
if (key_only) {
rb_ary_push(obj, passed_keywords[i]); rb_ary_push(obj, passed_keywords[i]);
} }
else {
rb_hash_aset(obj, passed_keywords[i], kw_argv[i]);
} }
return obj;
}
static VALUE
make_rest_kw_hash(const VALUE *passed_keywords, int passed_keyword_len, const VALUE *kw_argv)
{
int i;
VALUE obj = rb_hash_new();
for (i=0; i<passed_keyword_len; i++) {
if (kw_argv[i] != Qundef) {
rb_hash_aset(obj, passed_keywords[i], kw_argv[i]);
} }
} }
return obj; return obj;
@ -442,11 +451,11 @@ args_setup_kw_parameters(VALUE* const passed_values, const int passed_keyword_le
if (iseq->body->param.flags.has_kwrest) { if (iseq->body->param.flags.has_kwrest) {
const int rest_hash_index = key_num + 1; const int rest_hash_index = key_num + 1;
locals[rest_hash_index] = make_unused_kw_hash(passed_keywords, passed_keyword_len, passed_values, FALSE); locals[rest_hash_index] = make_rest_kw_hash(passed_keywords, passed_keyword_len, passed_values);
} }
else { else {
if (found != passed_keyword_len) { if (found != passed_keyword_len) {
VALUE keys = make_unused_kw_hash(passed_keywords, passed_keyword_len, passed_values, TRUE); VALUE keys = make_unknown_kw_hash(passed_keywords, passed_keyword_len, passed_values);
argument_kw_error(GET_THREAD(), iseq, "unknown", keys); argument_kw_error(GET_THREAD(), iseq, "unknown", keys);
} }
} }