* parse.y (string_content): reset lexical states at the beginning of

  string contents.  [ruby-list:39061]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 0 deletions

diff --git a/parse.y b/parse.y
index 6bf656fe29..1de67b58f6 100644
--- a/parse.y
+++ b/parse.y
@@ -2063,10 +2063,14 @@ 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) && nd_type($$) == NODE_NEWLINE) {
 			    $$ = $$->nd_next;
 			    rb_gc_force_recycle((VALUE)$3);