* parse.y (literal_concat_string): non-string last expression in

  #{} was ignored when followed by literal.


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

1 files changed, 3 insertions, 2 deletions

diff --git a/parse.y b/parse.y
index b20f941fb4..ef6b507d23 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: