summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-30 19:18:05 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-30 19:18:05 +0000
commit25adb4198c1afa84f48688f1d6f3294b2d928141 (patch)
treed13c9cc632c6260cfd00d4a8ff46f8186e5072be
parent7a9a5fd55866f8e80b4510e51c9b13da88330a31 (diff)
downloadruby-25adb4198c1afa84f48688f1d6f3294b2d928141.tar.gz
ruby-25adb4198c1afa84f48688f1d6f3294b2d928141.tar.xz
ruby-25adb4198c1afa84f48688f1d6f3294b2d928141.zip
* parse.y (f_norm_arg, f_arg_item): not croak already erred names.
[ruby-dev:31687] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13322 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6677ff784..fcbddabbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Fri Aug 31 03:48:58 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Aug 31 04:18:03 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (f_norm_arg, f_arg_item): not croak already erred names.
+ [ruby-dev:31687]
* parse.y (assignable_gen): ignore already erred names.
diff --git a/parse.y b/parse.y
index e1f74a1f9..74891b1e1 100644
--- a/parse.y
+++ b/parse.y
@@ -4160,6 +4160,8 @@ f_norm_arg : tCONSTANT
| tIDENTIFIER
{
/*%%%*/
+ if (!is_local_id($1))
+ yyerror("formal argument must be local variable");
shadowing_lvar($1);
/*%
%*/
@@ -4170,8 +4172,6 @@ f_norm_arg : tCONSTANT
f_arg_item : f_norm_arg
{
/*%%%*/
- if (!is_local_id($1))
- yyerror("formal argument must be local variable");
arg_var($1);
$$ = NEW_ARGS_AUX($1, 1);
/*%