summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--parse.y2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0251f1e9ff..0f83d62b43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Sep 10 08:25:47 2011 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (bv_decls): parse.y relies on $$ = $1 before action
+ routines. a patch from Michael Edgar. [Bug #5303]
+ [ruby-core:39429]
+
Sat Sep 10 01:37:55 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* sample/drb/dhasenc.rb: coding cookie of Emacs is coding,
diff --git a/parse.y b/parse.y
index df8dc75307..ada62e70a6 100644
--- a/parse.y
+++ b/parse.y
@@ -3498,7 +3498,7 @@ bv_decls : bvar
/*%c%*/
/*%c
{
- rb_ary_push($$, $3);
+ rb_ary_push($1, $3);
}
%*/
;