ruby-changes:22747
From: nobu <ko1@a...>
Date: Sat, 25 Feb 2012 07:54:14 +0900 (JST)
Subject: [ruby-changes:22747] nobu:r34796 (trunk): * parse.y (parser_tokadd_string): insert a backslash only if
nobu 2012-02-25 07:54:00 +0900 (Sat, 25 Feb 2012) New Revision: 34796 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34796 Log: * parse.y (parser_tokadd_string): insert a backslash only if quoted by single quotes. [ruby-dev:45281] [Bug #6069] Modified files: trunk/ChangeLog trunk/parse.y trunk/test/ruby/test_literal.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 34795) +++ ChangeLog (revision 34796) @@ -1,3 +1,8 @@ +Sat Feb 25 07:53:58 2012 Nobuyoshi Nakada <nobu@r...> + + * parse.y (parser_tokadd_string): insert a backslash only if + quoted by single quotes. [ruby-dev:45281] [Bug #6069] + Sat Feb 25 07:53:49 2012 Nobuyoshi Nakada <nobu@r...> * dir.c (dir_inspect), io.c (rb_io_inspect): keep encoding of path. Index: parse.y =================================================================== --- parse.y (revision 34795) +++ parse.y (revision 34796) @@ -6507,7 +6507,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) { @@ -7597,7 +7597,6 @@ } 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 34795) +++ test/ruby/test_literal.rb (revision 34796) @@ -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/