merge revision(s) 14313:

shyouhei · shyouhei · commit f6b5a01290d7 · 2008-06-07T20:36:33.000Z
* parse.y (f_rest_arg): check if duplicated.  [ruby-core:14140]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun  8 05:35:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_rest_arg): check if duplicated.  [ruby-core:14140]
+
 Sun Jun  8 05:21:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (RUBY_CHECK_VARTYPE): check if a variable is defined
diff --git a/parse.y b/parse.y
@@ -2343,6 +2343,8 @@ f_rest_arg	: restarg_mark tIDENTIFIER
 		    {
 			if (!is_local_id($2))
 			    yyerror("rest argument must be local variable");
+			else if (local_id($2))
+			    yyerror("duplicate rest argument name");
 			if (dyna_in_block()) {
 			    rb_dvar_push($2, Qnil);
 			}
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 160
+#define RUBY_PATCHLEVEL 161
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

Original file line number	Diff line number	Diff line change
`@@ -2343,6 +2343,8 @@ f_rest_arg : restarg_mark tIDENTIFIER`
`2343`	`2343`	`{`
`2344`	`2344`	`if (!is_local_id($2))`
`2345`	`2345`	`yyerror("rest argument must be local variable");`
	`2346`	`+ else if (local_id($2))`
	`2347`	`+ yyerror("duplicate rest argument name");`
`2346`	`2348`	`if (dyna_in_block()) {`
`2347`	`2349`	`rb_dvar_push($2, Qnil);`
`2348`	`2350`	`}`