naruse	2012-05-14 13:19:06 +0900 (Mon, 14 May 2012)

  New Revision: 35643

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

  Log:
    merge revision(s) 34796:
    
    * parse.y (parser_tokadd_string): insert a backslash only if
      quoted by single quotes.  [ruby-dev:45281] [Bug #6069]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/parse.y
    branches/ruby_1_9_3/test/ruby/test_literal.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35642)
+++ ruby_1_9_3/ChangeLog	(revision 35643)
@@ -1,3 +1,8 @@
+Mon May 14 13:18:56 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* parse.y (parser_tokadd_string): insert a backslash only if
+	  quoted by single quotes.  [ruby-dev:45281] [Bug #6069]
+
 Mon May 14 13:17:57 2012  Luis Lavena  <luislavena@g...>
 
 	* test/ruby/test_io.rb (class TestIO):  Disable GC during IO tests to
Index: ruby_1_9_3/parse.y
===================================================================
--- ruby_1_9_3/parse.y	(revision 35642)
+++ ruby_1_9_3/parse.y	(revision 35643)
@@ -5926,7 +5926,7 @@
 	      default:
 		if (c == -1) return -1;
 		if (!ISASCII(c)) {
-		    tokadd('\\');
+		    if ((func & STR_FUNC_EXPAND) == 0) tokadd('\\');
 		    goto non_ascii;
 		}
 		if (func & STR_FUNC_REGEXP) {
@@ -7015,7 +7015,6 @@
             }
             else if (!lex_eol_p() && !(c = *lex_p, ISASCII(c))) {
                 nextc();
-		tokadd('\\');
                 if (tokadd_mbchar(c) == -1) return 0;
             }
             else {
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35642)
+++ ruby_1_9_3/version.h	(revision 35643)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 212
+#define RUBY_PATCHLEVEL 213
 
 #define RUBY_RELEASE_DATE "2012-05-14"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/ruby/test_literal.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_literal.rb	(revision 35642)
+++ ruby_1_9_3/test/ruby/test_literal.rb	(revision 35643)
@@ -79,9 +79,15 @@
     assert_equal "\x13", "\c\x33"
     assert_equal "\x13", "\C-\x33"
     assert_equal "\xB3", "\M-\x33"
-    assert_equal "\\\u201c", eval(%["\\\u{201c}"]), bug6069
-    assert_equal "\\\u201c".encode("euc-jp"), eval(%["\\\u{201c}"].encode("euc-jp")), bug6069
-    assert_equal "\\\u201c".encode("iso-8859-13"), eval(%["\\\u{201c}"].encode("iso-8859-13")), bug6069
+    assert_equal "\u201c", eval(%["\\\u{201c}"]), bug5262
+    assert_equal "\u201c".encode("euc-jp"), eval(%["\\\u{201c}"].encode("euc-jp")), bug5262
+    assert_equal "\u201c".encode("iso-8859-13"), eval(%["\\\u{201c}"].encode("iso-8859-13")), bug5262
+    assert_equal "\\\u201c", eval(%['\\\u{201c}']), bug6069
+    assert_equal "\\\u201c".encode("euc-jp"), eval(%['\\\u{201c}'].encode("euc-jp")), bug6069
+    assert_equal "\\\u201c".encode("iso-8859-13"), eval(%['\\\u{201c}'].encode("iso-8859-13")), bug6069
+    assert_equal "\u201c", eval(%[?\\\u{201c}]), bug6069
+    assert_equal "\u201c".encode("euc-jp"), eval(%[?\\\u{201c}].encode("euc-jp")), bug6069
+    assert_equal "\u201c".encode("iso-8859-13"), eval(%[?\\\u{201c}].encode("iso-8859-13")), bug6069
   end
 
   def test_dstring

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