nobu	2013-12-08 16:19:30 +0900 (Sun, 08 Dec 2013)

  New Revision: 44069

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44069

  Log:
    class.c, vm_insnhelper.c: check unknown keywords
    
    * class.c (rb_get_kwargs): if optional is negative, unknown
      keywords are allowed.
    * vm_insnhelper.c (vm_callee_setup_keyword_arg): check unknown
      keywords.

  Modified files:
    trunk/ChangeLog
    trunk/class.c
    trunk/test/ruby/test_keyword.rb
    trunk/vm_insnhelper.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 44068)
+++ ChangeLog	(revision 44069)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Dec  8 16:19:28 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* class.c (rb_get_kwargs): if optional is negative, unknown
+	  keywords are allowed.
+
+	* vm_insnhelper.c (vm_callee_setup_keyword_arg): check unknown
+	  keywords.
+
 Sun Dec  8 14:55:12 2013  Kazuki Tsujimoto  <kazuki@c...>
 
 	* array.c (rb_ary_shuffle_bang, rb_ary_sample): rename local variables.
Index: class.c
===================================================================
--- class.c	(revision 44068)
+++ class.c	(revision 44069)
@@ -1912,8 +1912,13 @@ int https://github.com/ruby/ruby/blob/trunk/class.c#L1912
 rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *values)
 {
     int i = 0, j;
+    int rest = 0;
     VALUE missing = Qnil;
 
+    if (optional < 0) {
+	rest = 1;
+	optional = -1-optional;
+    }
     if (values) {
 	for (j = 0; j < required + optional; j++) {
 	    values[j] = Qundef;
@@ -1945,6 +1950,8 @@ rb_get_kwargs(VALUE keyword_hash, const https://github.com/ruby/ruby/blob/trunk/class.c#L1950
 		j++;
 	    }
 	}
+    }
+    if (!rest && keyword_hash) {
 	if (RHASH_SIZE(keyword_hash) > (unsigned int)j) {
 	    unknown_keyword_error(keyword_hash, table, required+optional);
 	}
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 44068)
+++ vm_insnhelper.c	(revision 44069)
@@ -1067,7 +1067,8 @@ vm_caller_setup_args(const rb_thread_t * https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L1067
 static inline int
 vm_callee_setup_keyword_arg(const rb_iseq_t *iseq, int argc, int m, VALUE *orig_argv, VALUE *kwd)
 {
-    VALUE keyword_hash, orig_hash;
+    VALUE keyword_hash = 0, orig_hash;
+    int optional = iseq->arg_keywords - iseq->arg_keyword_required;
 
     if (argc > m &&
 	!NIL_P(orig_hash = rb_check_hash_type(orig_argv[argc-1])) &&
@@ -1078,14 +1079,11 @@ vm_callee_setup_keyword_arg(const rb_ise https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L1079
 	else {
 	    orig_argv[argc-1] = orig_hash;
 	}
-	rb_get_kwargs(keyword_hash, iseq->arg_keyword_table, iseq->arg_keyword_required,
-		      iseq->arg_keyword_check ? iseq->arg_keywords - iseq->arg_keyword_required : 0,
-		      NULL);
     }
-    else if (iseq->arg_keyword_required) {
-	rb_get_kwargs(0, iseq->arg_keyword_table, iseq->arg_keyword_required, 0, NULL);
-    }
-    else {
+    rb_get_kwargs(keyword_hash, iseq->arg_keyword_table, iseq->arg_keyword_required,
+		  (iseq->arg_keyword_check ? optional : -1-optional),
+		  NULL);
+    if (!keyword_hash) {
 	keyword_hash = rb_hash_new();
     }
 
Index: test/ruby/test_keyword.rb
===================================================================
--- test/ruby/test_keyword.rb	(revision 44068)
+++ test/ruby/test_keyword.rb	(revision 44069)
@@ -306,6 +306,7 @@ class TestKeywordArguments < Test::Unit: https://github.com/ruby/ruby/blob/trunk/test/ruby/test_keyword.rb#L306
       eval("def o.bar(a:,**b) [a, b]; end")
     end
     assert_raise_with_message(ArgumentError, /missing keyword/, feature7701) {o.foo}
+    assert_raise_with_message(ArgumentError, /unknown keyword/, feature7701) {o.foo(a:0, b:1)}
     assert_equal(42, o.foo(a: 42), feature7701)
     assert_equal([[:keyreq, :a]], o.method(:foo).parameters, feature7701)
 
@@ -323,6 +324,7 @@ class TestKeywordArguments < Test::Unit: https://github.com/ruby/ruby/blob/trunk/test/ruby/test_keyword.rb#L324
       break eval("proc {|a:| a}")
     end
     assert_raise_with_message(ArgumentError, /missing keyword/, feature7701) {b.call}
+    assert_raise_with_message(ArgumentError, /unknown keyword/, feature7701) {b.call(a:0, b:1)}
     assert_equal(42, b.call(a: 42), feature7701)
     assert_equal([[:keyreq, :a]], b.parameters, feature7701)
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/