summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-06 03:15:08 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-06 03:15:08 +0000
commit8d6ccfd4326b086c7b569df42b793739da8424e9 (patch)
tree5343a3509de0d13322782c2618c00fcc7e6b6850
parentcea105d87318c075977666c14003c6c6941bd035 (diff)
* parse.y (opt_block_param): command can start just after block param
definition. [ruby-list:44479] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 37bb3b3690..a93677bff9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 6 12:15:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (opt_block_param): command can start just after block param
+ definition. [ruby-list:44479]
+
Thu Mar 6 00:34:11 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/erb.rb: update RDoc. Thanks Makoto Kuwata [ruby-dev:33702]
diff --git a/parse.y b/parse.y
index bde4c1d095..8fd4607d3a 100644
--- a/parse.y
+++ b/parse.y
@@ -1765,14 +1765,17 @@ opt_block_var : none
| '|' /* none */ '|'
{
$$ = (NODE*)1;
+ command_start = Qtrue;
}
| tOROP
{
$$ = (NODE*)1;
+ command_start = Qtrue;
}
| '|' block_var '|'
{
$$ = $2;
+ command_start = Qtrue;
}
;