mame	2009-07-31 03:02:37 +0900 (Fri, 31 Jul 2009)

  New Revision: 24332

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24332

  Log:
    * parse.y (literal_concat_gen): NODE_DSTR was incorrectly handled as
      NODE_STR.  [ruby-dev:38968]
    * bootstraptest/test_syntax.rb: add a test for above.

  Modified files:
    trunk/ChangeLog
    trunk/bootstraptest/test_syntax.rb
    trunk/parse.y

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24331)
+++ ChangeLog	(revision 24332)
@@ -1,3 +1,10 @@
+Fri Jul 31 02:57:39 2009  Yusuke Endoh  <mame@t...>
+
+	* parse.y (literal_concat_gen): NODE_DSTR was incorrectly handled as
+	  NODE_STR.  [ruby-dev:38968]
+
+	* bootstraptest/test_syntax.rb: add a test for above.
+
 Fri Jul 31 00:55:48 2009  Yusuke Endoh  <mame@t...>
 
 	* test/ruby/test_module.rb (test_ancestors, test_included_modules):
Index: bootstraptest/test_syntax.rb
===================================================================
--- bootstraptest/test_syntax.rb	(revision 24331)
+++ bootstraptest/test_syntax.rb	(revision 24332)
@@ -828,3 +828,6 @@
   p a.compact!
 }
 
+assert_equal 'ok', %q{
+  "#{}""#{}ok"
+}, '[ruby-dev:38968]'
Index: parse.y
===================================================================
--- parse.y	(revision 24331)
+++ parse.y	(revision 24332)
@@ -7833,9 +7833,7 @@
 	    head = tail;
 	}
 	else {
-	    nd_set_type(tail, NODE_ARRAY);
-	    tail->nd_head = NEW_STR(tail->nd_lit);
-	    list_concat(head, tail);
+	    list_concat(head, NEW_ARRAY(tail));
 	}
 	break;
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/