summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--bootstraptest/test_syntax.rb6
-rw-r--r--parse.y20
3 files changed, 23 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 2817078e59c..4bf555b26a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 18 12:32:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (string_content): preserve cond_stack and cmdarg_stack.
+ [ruby-core:29579]
+
Sun Apr 18 05:50:58 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/yaml_tree.rb: defaulting binary string
diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb
index 619a4cbdb16..44db11babf6 100644
--- a/bootstraptest/test_syntax.rb
+++ b/bootstraptest/test_syntax.rb
@@ -884,3 +884,9 @@ assert_normal_exit %q{
e
}
}, '[ruby-dev:39861]'
+
+bug1240 = '[ruby-core:22637]'
+assert_valid_syntax('x y { "#{}".z { } }', bug1240)
+assert_valid_syntax('x y { "#{}".z do end }', bug1240)
+
+assert_valid_syntax('y "#{a 1}" do end', '[ruby-core:29579]')
diff --git a/parse.y b/parse.y
index f234ae36fdf..fd788daacd3 100644
--- a/parse.y
+++ b/parse.y
@@ -4030,18 +4030,26 @@ string_content : tSTRING_CONTENT
}
| tSTRING_DBEG
{
+ $<num>1 = cond_stack;
+ $<num>$ = cmdarg_stack;
+ cond_stack = 0;
+ cmdarg_stack = 0;
+ }
+ {
$<node>$ = lex_strterm;
lex_strterm = 0;
lex_state = EXPR_BEG;
}
compstmt '}'
{
- lex_strterm = $<node>2;
+ cond_stack = $<num>1;
+ cmdarg_stack = $<num>2;
+ lex_strterm = $<node>3;
/*%%%*/
- if ($3) $3->flags &= ~NODE_FL_NEWLINE;
- $$ = new_evstr($3);
+ if ($4) $4->flags &= ~NODE_FL_NEWLINE;
+ $$ = new_evstr($4);
/*%
- $$ = dispatch1(string_embexpr, $3);
+ $$ = dispatch1(string_embexpr, $4);
%*/
}
;
@@ -5869,8 +5877,6 @@ 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('#');
@@ -6068,8 +6074,6 @@ 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('#');