diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | parse.y | 10 |
2 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Fri Apr 16 21:52:16 2010 Yusuke Endoh <mame@tsg.ne.jp> + + * parse.y (string_content, etc): counts of CMDARG_PUSH and POP were + inconsistent. [ruby-core:22637] + Fri Apr 16 21:27:57 2010 Yusuke Endoh <mame@tsg.ne.jp> * ext/bigdecimal/bigdecimal.c (BigDecimal_coerce): revert r23389, @@ -4033,14 +4033,10 @@ string_content : tSTRING_CONTENT $<node>$ = lex_strterm; lex_strterm = 0; lex_state = EXPR_BEG; - COND_PUSH(0); - CMDARG_PUSH(0); } compstmt '}' { lex_strterm = $<node>2; - COND_LEXPOP(); - CMDARG_LEXPOP(); /*%%%*/ if ($3) $3->flags &= ~NODE_FL_NEWLINE; $$ = new_evstr($3); @@ -5873,6 +5869,8 @@ parser_parse_string(struct parser_params *parser, NODE *quote) pushback(c); return tSTRING_DVAR; case '{': + COND_PUSH(0); + CMDARG_PUSH(0); return tSTRING_DBEG; } tokadd('#'); @@ -6070,6 +6068,8 @@ parser_here_document(struct parser_params *parser, NODE *here) pushback(c); return tSTRING_DVAR; case '{': + COND_PUSH(0); + CMDARG_PUSH(0); return tSTRING_DBEG; } tokadd('#'); @@ -7314,6 +7314,8 @@ parser_yylex(struct parser_params *parser) lex_state = EXPR_BEG; lpar_beg = 0; --paren_nest; + COND_PUSH(0); + CMDARG_PUSH(0); return tLAMBEG; } if (IS_ARG() || lex_state == EXPR_END) |