From b09f1c5d6ccd7cde63adb901d6483dde448be829 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 20:37:36 +0000 Subject: merge revision(s) 14313: * 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_6@16996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ parse.y | 2 ++ version.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ca6af2ab2e..16d027ffac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jun 8 05:37:10 2008 Nobuyoshi Nakada + + * parse.y (f_rest_arg): check if duplicated. [ruby-core:14140] + Sun Jun 8 05:32:45 2008 Tanaka Akira * gc.c (stack_end_address): use local variable address instead of diff --git a/parse.y b/parse.y index e1b9c1d410..33db814826 100644 --- 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 index 1e653ce6d4..17f8a3555a 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 160 +#define RUBY_PATCHLEVEL 161 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3