ruby-changes:22089
From: mame <ko1@a...>
Date: Mon, 26 Dec 2011 23:20:38 +0900 (JST)
Subject: [ruby-changes:22089] mame:r34137 (trunk): * vm_core.h (struct rb_iseq_struct), compile.c (iseq_set_arguments), iseq.c (rb_iseq_parameters), vm_insnhelper.c (vm_callee_setup_arg_complex): support Method#parameters for keyword arguments. The provisional spec is what Benoit Daloze proposed.
mame 2011-12-26 23:20:15 +0900 (Mon, 26 Dec 2011) New Revision: 34137 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34137 Log: * vm_core.h (struct rb_iseq_struct), compile.c (iseq_set_arguments), iseq.c (rb_iseq_parameters), vm_insnhelper.c (vm_callee_setup_arg_complex): support Method#parameters for keyword arguments. The provisional spec is what Benoit Daloze proposed. [ruby-core:40518] * test/ruby/test_keyword.rb: add a test for above. Modified files: trunk/ChangeLog trunk/compile.c trunk/iseq.c trunk/test/ruby/test_keyword.rb trunk/vm_core.h trunk/vm_insnhelper.c Index: ChangeLog =================================================================== --- ChangeLog (revision 34136) +++ ChangeLog (revision 34137) @@ -1,3 +1,13 @@ +Mon Dec 26 22:31:07 2011 Yusuke Endoh <mame@t...> + + * vm_core.h (struct rb_iseq_struct), compile.c (iseq_set_arguments), + iseq.c (rb_iseq_parameters), vm_insnhelper.c + (vm_callee_setup_arg_complex): support Method#parameters for keyword + arguments. The provisional spec is what Benoit Daloze proposed. + [ruby-core:40518] + + * test/ruby/test_keyword.rb: add a test for above. + Mon Dec 26 22:15:27 2011 Yusuke Endoh <mame@t...> * vm_core.h (struct rb_iseq_struct), compile.c (iseq_set_arguments, Index: vm_core.h =================================================================== --- vm_core.h (revision 34136) +++ vm_core.h (revision 34137) @@ -221,6 +221,7 @@ int arg_size; VALUE *arg_opt_table; int arg_keyword; + int arg_keyword_check; /* if this is true, raise an ArgumentError when unknown keyword argument is passed */ int arg_keywords; ID *arg_keyword_table; Index: iseq.c =================================================================== --- iseq.c (revision 34136) +++ iseq.c (revision 34137) @@ -1386,7 +1386,7 @@ { int i, r; VALUE a, args = rb_ary_new2(iseq->arg_size); - ID req, opt, rest, block; + ID req, opt, rest, block, key, keyrest; #define PARAM_TYPE(type) rb_ary_push(a = rb_ary_new2(2), ID2SYM(type)) #define PARAM_ID(i) iseq->local_table[(i)] #define PARAM(i, type) ( \ @@ -1412,7 +1412,9 @@ r = iseq->arg_rest != -1 ? iseq->arg_rest : iseq->arg_post_len > 0 ? iseq->arg_post_start : iseq->arg_block != -1 ? iseq->arg_block : + iseq->arg_keyword != -1 ? iseq->arg_keyword : iseq->arg_size; + if (iseq->arg_keyword != -1) r -= iseq->arg_keywords; for (; i < r; i++) { PARAM_TYPE(opt); if (rb_id2name(PARAM_ID(i))) { @@ -1437,6 +1439,20 @@ rb_ary_push(args, PARAM(i, req)); } } + if (iseq->arg_keyword != -1) { + CONST_ID(key, "key"); + for (i = 0; i < iseq->arg_keywords; i++) { + PARAM_TYPE(key); + if (rb_id2name(iseq->arg_keyword_table[i])) { + rb_ary_push(a, ID2SYM(iseq->arg_keyword_table[i])); + } + rb_ary_push(args, a); + } + if (rb_id2name(iseq->local_table[iseq->arg_keyword])) { + CONST_ID(keyrest, "keyrest"); + rb_ary_push(args, PARAM(iseq->arg_keyword, keyrest)); + } + } if (iseq->arg_block != -1) { CONST_ID(block, "block"); rb_ary_push(args, PARAM(iseq->arg_block, block)); Index: compile.c =================================================================== --- compile.c (revision 34136) +++ compile.c (revision 34137) @@ -1140,17 +1140,12 @@ node = node->nd_next; i += 1; } - if ((args->kw_rest_arg->nd_vid & ID_SCOPE_MASK) == ID_JUNK) { - iseq->arg_keywords = i; - iseq->arg_keyword_table = ALLOC_N(ID, i); - for (j = 0; j < i; j++) { - iseq->arg_keyword_table[j] = FIX2INT(RARRAY_PTR(keywords)[j]); - } + iseq->arg_keyword_check = (args->kw_rest_arg->nd_vid & ID_SCOPE_MASK) == ID_JUNK; + iseq->arg_keywords = i; + iseq->arg_keyword_table = ALLOC_N(ID, i); + for (j = 0; j < i; j++) { + iseq->arg_keyword_table[j] = FIX2INT(RARRAY_PTR(keywords)[j]); } - else { - iseq->arg_keywords = 0; - iseq->arg_keyword_table = 0; - } ADD_INSN(optargs, nd_line(args->kw_args), pop); } else { Index: vm_insnhelper.c =================================================================== --- vm_insnhelper.c (revision 34136) +++ vm_insnhelper.c (revision 34137) @@ -172,7 +172,7 @@ if (!NIL_P(keyword_hash)) { argc--; keyword_hash = rb_hash_dup(keyword_hash); - if (iseq->arg_keywords) { + if (iseq->arg_keyword_check) { for (i = j = 0; i < iseq->arg_keywords; i++) { if (st_lookup(RHASH_TBL(keyword_hash), ID2SYM(iseq->arg_keyword_table[i]), 0)) j++; } Index: test/ruby/test_keyword.rb =================================================================== --- test/ruby/test_keyword.rb (revision 34136) +++ test/ruby/test_keyword.rb (revision 34137) @@ -94,6 +94,15 @@ assert_equal([[1, 2, 3], "bar", 424242, {}], f7(1, 2, 3, str: "bar")) end + def test_method_parameters + assert_equal([[:key, :str], [:key, :num]], method(:f1).parameters); + assert_equal([[:req, :x], [:key, :str], [:key, :num]], method(:f2).parameters); + assert_equal([[:key, :str], [:key, :num], [:keyrest, :h]], method(:f3).parameters); + assert_equal([[:key, :str], [:key, :num]], method(:f4).parameters); + assert_equal([[:key, :str], [:key, :num], [:keyrest, :h]], method(:f5).parameters); + assert_equal([[:key, :str], [:key, :num], [:keyrest, :h], [:block, :blk]], method(:f6).parameters); + assert_equal([[:rest, :r], [:key, :str], [:key, :num], [:keyrest, :h]], method(:f7).parameters); + end def test_lambda f = ->(str: "foo", num: 424242) { [str, num] } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/