summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-23 06:51:21 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-23 06:51:21 +0000
commit3ca48540a397adc35a51b75c70339219410b2b57 (patch)
tree476686ea7d6b5b5c650581882f96193fbbeb2b90
parent288d0808046f75860cafe3aa34c376d2eb616731 (diff)
downloadruby-3ca48540a397adc35a51b75c70339219410b2b57.tar.gz
ruby-3ca48540a397adc35a51b75c70339219410b2b57.tar.xz
ruby-3ca48540a397adc35a51b75c70339219410b2b57.zip
* parse.y (f_norm_arg): ripper has no shadowing check.
* parse.y (f_block_arg): dispatch blkarg_mark. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--parse.y5
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e8ac48823..1c15034c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug 23 15:51:19 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (f_norm_arg): ripper has no shadowing check.
+
+ * parse.y (f_block_arg): dispatch blkarg_mark.
+
Thu Aug 23 15:48:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (make_masgn_lhs, iseq_compile_each): fixed indent.
diff --git a/parse.y b/parse.y
index 857c411d1..64532067c 100644
--- a/parse.y
+++ b/parse.y
@@ -4154,7 +4154,10 @@ f_norm_arg : tCONSTANT
}
| tIDENTIFIER
{
+ /*%%%*/
shadowing_lvar($1);
+ /*%
+ %*/
$$ = $1;
}
;
@@ -4288,7 +4291,7 @@ f_block_arg : blkarg_mark tIDENTIFIER
arg_var($2);
$$ = $2;
/*%
- $$ = $2;
+ $$ = dispatch1(blockarg, $2);
%*/
}
;