* 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

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f6715856..20b30a5b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 27 08:28:18 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* parse.y (literal_concat_string): non-string last expression in
+	  #{} was ignored when followed by literal.
+
 Wed Jun 26 15:40:00 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* parse.y (words, qwords): word list literal rules.
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: