ruby-changes:15460
From: mame <ko1@a...>
Date: Fri, 16 Apr 2010 21:59:25 +0900 (JST)
Subject: [ruby-changes:15460] Ruby:r27359 (trunk): * parse.y (string_content, etc): counts of CMDARG_PUSH and POP were
mame 2010-04-16 21:57:28 +0900 (Fri, 16 Apr 2010) New Revision: 27359 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27359 Log: * parse.y (string_content, etc): counts of CMDARG_PUSH and POP were inconsistent. [ruby-core:22637] Modified files: trunk/ChangeLog trunk/parse.y Index: ChangeLog =================================================================== --- ChangeLog (revision 27358) +++ ChangeLog (revision 27359) @@ -1,3 +1,8 @@ +Fri Apr 16 21:52:16 2010 Yusuke Endoh <mame@t...> + + * 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@t...> * ext/bigdecimal/bigdecimal.c (BigDecimal_coerce): revert r23389, Index: parse.y =================================================================== --- parse.y (revision 27358) +++ parse.y (revision 27359) @@ -4033,14 +4033,10 @@ $<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 @@ pushback(c); return tSTRING_DVAR; case '{': + COND_PUSH(0); + CMDARG_PUSH(0); return tSTRING_DBEG; } tokadd('#'); @@ -6070,6 +6068,8 @@ pushback(c); return tSTRING_DVAR; case '{': + COND_PUSH(0); + CMDARG_PUSH(0); return tSTRING_DBEG; } tokadd('#'); @@ -7314,6 +7314,8 @@ lex_state = EXPR_BEG; lpar_beg = 0; --paren_nest; + COND_PUSH(0); + CMDARG_PUSH(0); return tLAMBEG; } if (IS_ARG() || lex_state == EXPR_END) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/