summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-04 22:47:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-04 22:47:33 +0000
commitd374f9903ea9ad26ed0bc3c3abeaed2951f0a7f1 (patch)
treea56e08204217955384717955fb21a0b1eb6156c6
parent6186829a9b4c6dcc4fecce7d6357e25775459e8f (diff)
downloadruby-d374f9903ea9ad26ed0bc3c3abeaed2951f0a7f1.tar.gz
ruby-d374f9903ea9ad26ed0bc3c3abeaed2951f0a7f1.tar.xz
ruby-d374f9903ea9ad26ed0bc3c3abeaed2951f0a7f1.zip
* parse.y (BEGIN): now local_push are local_pop are necessary in
ripper. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y5
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fd1212452..ecad14c83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 5 07:47:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (BEGIN): now local_push are local_pop are necessary in
+ ripper.
+
Wed Nov 4 21:39:10 2009 NARUSE, Yui <naruse@ruby-lang.org>
* .document: add some README files to default rdoc's of trunk.
diff --git a/parse.y b/parse.y
index b8d9b595e..c10dfe626 100644
--- a/parse.y
+++ b/parse.y
@@ -988,10 +988,7 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem
if (in_def || in_single) {
yyerror("BEGIN in method");
}
- /*%%%*/
/* local_push(0); */
- /*%
- %*/
}
'{' compstmt '}'
{
@@ -999,11 +996,11 @@ stmt : keyword_alias fitem {lex_state = EXPR_FNAME;} fitem
ruby_eval_tree_begin = block_append(ruby_eval_tree_begin,
$4);
/* NEW_PREEXE($4)); */
- /* local_pop(); */
$$ = NEW_BEGIN(0);
/*%
$$ = dispatch1(BEGIN, $4);
%*/
+ /* local_pop(); */
}
| keyword_END '{' compstmt '}'
{