merge revision(s) 34776:

	* parse.y (parser_tokadd_string, parser_yylex): insert a backslash
	  if the next character is non-ascii.  [ruby-dev:45278] [Bug #6069]


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

4 files changed, 17 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 3301eaf7c4..c66a17c007 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 24 08:53:28 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_tokadd_string, parser_yylex): insert a backslash
+	  if the next character is non-ascii.  [ruby-dev:45278] [Bug #6069]
+
 Thu Feb 23 14:44:36 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/uri/common.rb (URI::Parser#initialize_regexp):
diff --git a/parse.y b/parse.y
index b0da1b7cb6..985a80d6a3 100644
--- a/parse.y
+++ b/parse.y
@@ -5924,7 +5924,10 @@ parser_tokadd_string(struct parser_params *parser,
 
 	      default:
 		if (c == -1) return -1;
-		if (!ISASCII(c)) goto non_ascii;
+		if (!ISASCII(c)) {
+		    tokadd('\\');
+		    goto non_ascii;
+		}
 		if (func & STR_FUNC_REGEXP) {
 		    pushback(c);
 		    if ((c = tokadd_escape(&enc)) < 0)
@@ -7011,6 +7014,7 @@ parser_yylex(struct parser_params *parser)
             }
             else if (!lex_eol_p() && !(c = *lex_p, ISASCII(c))) {
                 nextc();
+		tokadd('\\');
                 if (tokadd_mbchar(c) == -1) return 0;
             }
             else {
diff --git a/test/ruby/test_literal.rb b/test/ruby/test_literal.rb
index 23c1c9b800..85490d659b 100644
--- a/test/ruby/test_literal.rb
+++ b/test/ruby/test_literal.rb
@@ -74,12 +74,13 @@ class TestRubyLiteral < Test::Unit::TestCase
         end
       end
     end
+    bug6069 = '[ruby-dev:45278]'
     assert_equal "\x13", "\c\x33"
     assert_equal "\x13", "\C-\x33"
     assert_equal "\xB3", "\M-\x33"
-    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
   end
 
   def test_dstring
diff --git a/version.h b/version.h
index bd7e0731ee..47bacd55ac 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 141
+#define RUBY_PATCHLEVEL 142
 
-#define RUBY_RELEASE_DATE "2012-02-23"
+#define RUBY_RELEASE_DATE "2012-02-24"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 24
 
 #include "ruby/version.h"