diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-12-26 14:20:20 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-12-26 14:20:20 +0000 |
| commit | c5e372ff277af2b69c785290389f638dbfef820d (patch) | |
| tree | ea60655d29f59060254f403f5cef879b4713c280 /vm_insnhelper.c | |
| parent | d0baa0dd52fb1d72e23633bb2ba5a551957a4776 (diff) | |
* vm_insnhelper.c (unknown_keyword_error): make it kind a error message when unknown keyword is given. It require more work. See [ruby-core:40518] and [ruby-core:40541] in detail.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 5ab1eac1ea..1fdf330632 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -136,9 +136,17 @@ NORETURN(static void unknown_keyword_error(const rb_iseq_t *iseq, VALUE hash)); static void unknown_keyword_error(const rb_iseq_t *iseq, VALUE hash) { - (void) iseq; - (void) hash; - rb_raise(rb_eArgError, "unknown keyword"); + VALUE sep = rb_usascii_str_new2(", "), keys; + const char *msg; + int i; + for (i = 0; i < iseq->arg_keywords; i++) { + rb_hash_delete(hash, ID2SYM(iseq->arg_keyword_table[i])); + } + keys = rb_funcall(hash, rb_intern("keys"), 0, 0); + if (TYPE(keys) != T_ARRAY) rb_raise(rb_eArgError, "unknown keyword"); + msg = RARRAY_LEN(keys) == 1 ? "unknown keyword: %s" : "unknown keywords: %s"; + keys = rb_funcall(keys, rb_intern("join"), 1, sep); + rb_raise(rb_eArgError, msg, RSTRING_PTR(keys)); } #define VM_CALLEE_SETUP_ARG(ret, th, iseq, orig_argc, orig_argv, block) \ |