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

  string contents.  [ruby-list:39061]


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

2 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 760eb4068..d8043ccf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 22 16:21:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (string_content): reset lexical states at the beginning of
+	  string contents.  [ruby-list:39061]
+
 Wed Jan 21 21:55:51 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: remove O_NONBLOCK, thanks \ay
@@ -9,7 +14,7 @@ Wed Jan 21 17:57:56 2004  Shugo Maeda  <shugo@ruby-lang.org>
 	* lib/net/imap.rb (body): ditto.
 	* lib/net/imap.rb (number): ditto.
 	* lib/net/imap.rb (ensure_nz_number): show a detailed error
-	message.
+	  message.
 
 Wed Jan 21 16:44:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
diff --git a/parse.y b/parse.y
index 6bf656fe2..1de67b58f 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);