diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 10:29:38 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 10:29:38 +0000 |
commit | e86c91414055573dc914c83ab0725f43926f478f (patch) | |
tree | 4a693c412f1741fac43becf03e372d7d863711b4 /parse.y | |
parent | e9ebea251d5d6c20f15e06cd232dab2522c4d16f (diff) |
merge revision(s) 15541, 15545, 15558:
* parse.y (yycompile): clear ruby_eval_tree_begin too before parse.
* parse.y (yycompile): clear ruby_eval_tree_begin if parse failed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2624,6 +2624,7 @@ yycompile(f, line) ruby__end__seen = 0; ruby_eval_tree = 0; + ruby_eval_tree_begin = 0; heredoc_end = 0; lex_strterm = 0; ruby_current_node = 0; @@ -2649,7 +2650,7 @@ yycompile(f, line) rb_gc_force_recycle((VALUE)tmp); } if (n == 0) node = ruby_eval_tree; - else ruby_eval_tree_begin = 0; + if (ruby_nerrs) ruby_eval_tree_begin = 0; return node; } |