From 6115f65d7dd29561710c3e84bb27180e5bab4380 Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 27 Nov 2014 10:15:47 +0000 Subject: * vm_args.c: fix backtrace location for keyword related exceptions. For example, the following program def foo(k1: 1); end # line 1 foo(k2: 2) # line 2 causes "unknown keyword: k2 (ArgumentError)". Before this patch, the backtrace location is only line 2. However, error should be located at line 1 (over line 2 in stack trace). This patch fix this problem. * class.c (rb_keyword_error_new): separate exception creation logic from rb_keyword_error(), to use in vm_args.c. * vm_insnhelper.c (rb_arg_error_new): rename to rb_arity_error_new(). * vm_args.c (argument_arity_error): rename to argument_arity_error(). * vm_args.c (arugment_kw_error): added to fix backtrace. * test/ruby/test_keyword.rb: add tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- class.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'class.c') diff --git a/class.c b/class.c index 2869bf36b0..06a12a45a4 100644 --- a/class.c +++ b/class.c @@ -1857,11 +1857,12 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...) return argc; } -NORETURN(void rb_keyword_error(const char *error, VALUE keys)); -void -rb_keyword_error(const char *error, VALUE keys) +VALUE +rb_keyword_error_new(const char *error, VALUE keys) { const char *msg = ""; + VALUE error_message; + if (RARRAY_LEN(keys) == 1) { keys = RARRAY_AREF(keys, 0); } @@ -1869,7 +1870,17 @@ rb_keyword_error(const char *error, VALUE keys) keys = rb_ary_join(keys, rb_usascii_str_new2(", ")); msg = "s"; } - rb_raise(rb_eArgError, "%s keyword%s: %"PRIsVALUE, error, msg, keys); + + error_message = rb_sprintf("%s keyword%s: %"PRIsVALUE, error, msg, keys); + + return rb_exc_new_str(rb_eArgError, error_message); +} + +NORETURN(static void rb_keyword_error(const char *error, VALUE keys)); +static void +rb_keyword_error(const char *error, VALUE keys) +{ + rb_exc_raise(rb_keyword_error_new(error, keys)); } NORETURN(static void unknown_keyword_error(VALUE hash, const ID *table, int keywords)); -- cgit v1.2.3