From 8126f21cc9838a6a7444945727075c324c54f57b Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 26 Jan 2018 06:41:13 +0000 Subject: error.c: KeyError missing keyword arguments * error.c (key_err_initialize): leave attributes for missing keyword arguments unset, so accessors can tell if it is missing or explicit nil. [Feature #14313] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- error.c | 9 ++------- test/ruby/test_key_error.rb | 4 ++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/error.c b/error.c index 990f9f7855..7870e58035 100644 --- a/error.c +++ b/error.c @@ -1692,8 +1692,6 @@ key_err_initialize(int argc, VALUE *argv, VALUE self) { VALUE message; VALUE options; - VALUE receiver = Qnil; - VALUE key = Qnil; rb_scan_args(argc, argv, "01:", &message, &options); @@ -1711,16 +1709,13 @@ key_err_initialize(int argc, VALUE *argv, VALUE self) keywords[1] = id_key; rb_get_kwargs(options, keywords, 0, 2, values); if (values[0] != Qundef) { - receiver = values[0]; + rb_ivar_set(self, id_receiver, values[0]); } if (values[1] != Qundef) { - key = values[1]; + rb_ivar_set(self, id_key, values[1]); } } - rb_ivar_set(self, id_receiver, receiver); - rb_ivar_set(self, id_key, key); - return self; } diff --git a/test/ruby/test_key_error.rb b/test/ruby/test_key_error.rb index 852bd32712..fe1d5bb5ab 100644 --- a/test/ruby/test_key_error.rb +++ b/test/ruby/test_key_error.rb @@ -15,11 +15,15 @@ class TestKeyError < Test::Unit::TestCase receiver = Object.new error = KeyError.new(receiver: receiver) assert_equal(receiver, error.receiver) + error = KeyError.new + assert_raise(ArgumentError) {error.receiver} end def test_key error = KeyError.new(key: :key) assert_equal(:key, error.key) + error = KeyError.new + assert_raise(ArgumentError) {error.key} end def test_receiver_and_key -- cgit v1.2.3