diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-22 07:21:40 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-22 07:21:40 +0000 |
commit | 48b24fe53608844aa46a51e6e965b43c00e94a19 (patch) | |
tree | b26136e8bce16ac4d1689a41d9bc91509c59fb94 | |
parent | 002517aba82f3d318dab09f603491417240bfe0f (diff) | |
download | ruby-48b24fe53608844aa46a51e6e965b43c00e94a19.tar.gz |
* 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/trunk@5536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | parse.y | 4 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Jan 22 16:21:02 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (string_content): reset lexical states at the beginning of + string contents. [ruby-list:39061] + Thu Jan 22 01:46:32 2004 Yukihiro Matsumoto <matz@ruby-lang.org> * parse.y (newline_node): do not use NODE_NEWLINE node anymore, @@ -47,7 +52,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:15 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> @@ -2067,10 +2067,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(); $$ = new_evstr($3); } ; |