summaryrefslogtreecommitdiffstats
path: root/parse.y
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-06-26 23:29:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-06-26 23:29:10 +0000
commitd32cb4b2c6b887e37d8f41c17af7c304c4a09af1 (patch)
tree4b1b03e81f40c3a08e3e5201e096865351a2ff8f /parse.y
parent2dcc5900d542fe979d338c2f91bfbb8cf1d50975 (diff)
downloadruby-d32cb4b2c6b887e37d8f41c17af7c304c4a09af1.tar.gz
ruby-d32cb4b2c6b887e37d8f41c17af7c304c4a09af1.tar.xz
ruby-d32cb4b2c6b887e37d8f41c17af7c304c4a09af1.zip
* parse.y (literal_concat_string): non-string last expression in
#{} was ignored when followed by literal. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y5
1 files changed, 3 insertions, 2 deletions
diff --git a/parse.y b/parse.y
index b20f941fb..ef6b507d2 100644
--- a/parse.y
+++ b/parse.y
@@ -4359,7 +4359,7 @@ literal_concat_string(head, tail, str)
NODE *head, *tail;
VALUE str;
{
- NODE *last = head, *last1 = 0;
+ NODE *last = head, *last1 = 0, *prev = 0;
for (;;) {
switch (nd_type(last)) {
@@ -4368,10 +4368,11 @@ literal_concat_string(head, tail, str)
break;
case NODE_BLOCK:
case NODE_DSTR:
+ if (!last1) last1 = prev;
+ prev = last;
while (last->nd_next) {
last = last->nd_next;
}
- if (!last1) last1 = last;
last = last->nd_head;
break;
case NODE_STR: