ruby-changes:22727
From: nobu <ko1@a...>
Date: Fri, 24 Feb 2012 08:52:24 +0900 (JST)
Subject: [ruby-changes:22727] nobu:r34776 (trunk): * parse.y (parser_tokadd_string, parser_yylex): insert a backslash
nobu 2012-02-24 08:52:12 +0900 (Fri, 24 Feb 2012) New Revision: 34776 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34776 Log: * parse.y (parser_tokadd_string, parser_yylex): insert a backslash if the next character is non-ascii. [ruby-dev:45278] [Bug #6069] Modified files: trunk/ChangeLog trunk/parse.y trunk/test/ruby/test_literal.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 34775) +++ ChangeLog (revision 34776) @@ -1,3 +1,8 @@ +Fri Feb 24 08:52:09 2012 Nobuyoshi Nakada <nobu@r...> + + * parse.y (parser_tokadd_string, parser_yylex): insert a backslash + if the next character is non-ascii. [ruby-dev:45278] [Bug #6069] + Fri Feb 24 08:13:20 2012 Eric Hodel <drbrain@s...> * lib/profiler.rb: Add Profiler documentation by Gonzalo Rodriguez. Index: parse.y =================================================================== --- parse.y (revision 34775) +++ parse.y (revision 34776) @@ -6506,7 +6506,10 @@ 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) @@ -7594,6 +7597,7 @@ } else if (!lex_eol_p() && !(c = *lex_p, ISASCII(c))) { nextc(); + tokadd('\\'); if (tokadd_mbchar(c) == -1) return 0; } else { Index: test/ruby/test_literal.rb =================================================================== --- test/ruby/test_literal.rb (revision 34775) +++ test/ruby/test_literal.rb (revision 34776) @@ -74,12 +74,13 @@ 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/