diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 10:46:45 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 10:46:45 +0000 |
commit | 9de707ad302fd045fb01b1f5d3680c3fc65b95dd (patch) | |
tree | c07d1749bb3397e4d1ce7057c072678fd9458f35 /parse.y | |
parent | 823be2d795e2435cc5aa9b35c787fb5ac87d02ac (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_6@17186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2619,6 +2619,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; @@ -2644,7 +2645,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; } |