aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-13 05:00:23 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-13 05:00:23 +0000
commit458c4e98aad847abdfaf9b5260b065ed161360bc (patch)
tree52415f77cb86f3b07701a2c071bf270e1c2129c3
parentffc1b8af9be70cb6d46706054f0509a564f9de88 (diff)
downloadruby-458c4e98aad847abdfaf9b5260b065ed161360bc.tar.gz
* parse.y (brace_block): should use compstmt. patch submitted by
Kirill A. Shutemov <k.shutemov AT gmail.com> [ruby-core:12154]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b85b3ebcf7..8be7831c91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 13 14:00:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (brace_block): should use compstmt. patch submitted by
+ Kirill A. Shutemov <k.shutemov AT gmail.com> [ruby-core:12154].
+
Thu Sep 13 13:47:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (rb_id2str): fixed typo.
diff --git a/parse.y b/parse.y
index 513ae4004c..9eda35dd5e 100644
--- a/parse.y
+++ b/parse.y
@@ -3472,7 +3472,7 @@ brace_block : '{'
nd_set_line($$, $<num>2);
dyna_pop();
/*%
- $$ = dispatch2(do_block, escape_Qundef($3), $5);
+ $$ = dispatch2(do_block, escape_Qundef($3), $4);
%*/
}
;