shyouhei	2008-06-08 05:36:33 +0900 (Sun, 08 Jun 2008)

  New Revision: 16994

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/parse.y
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 14313:
    * parse.y (f_rest_arg): check if duplicated.  [ruby-core:14140]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16994&r2=16993&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/parse.y?r1=16994&r2=16993&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16994&r2=16993&diff_format=u

Index: ruby_1_8_5/parse.y
===================================================================
--- ruby_1_8_5/parse.y	(revision 16993)
+++ ruby_1_8_5/parse.y	(revision 16994)
@@ -2343,6 +2343,8 @@
 		    {
 			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);
 			}
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16993)
+++ ruby_1_8_5/ChangeLog	(revision 16994)
@@ -1,3 +1,7 @@
+Sun Jun  8 05:35:32 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* parse.y (f_rest_arg): check if duplicated.  [ruby-core:14140]
+
 Sun Jun  8 05:21:46 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (RUBY_CHECK_VARTYPE): check if a variable is defined
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16993)
+++ ruby_1_8_5/version.h	(revision 16994)
@@ -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

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