1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* parse.y (parser_tokadd_string, parser_yylex): insert a backslash

Browse Source 
if the next character is non-ascii.  [ruby-dev:45278] [Bug #6069]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34776 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-02-23 23:52:12 +00:00
parent 455c23fa01
commit 45c6daeed7
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Feb 24 08:52:09 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]
Fri Feb 24 08:13:20 2012 Eric Hodel <drbrain@segment7.net> Fri Feb 24 08:13:20 2012 Eric Hodel <drbrain@segment7.net>
* lib/profiler.rb: Add Profiler documentation by Gonzalo Rodriguez. * lib/profiler.rb: Add Profiler documentation by Gonzalo Rodriguez.

6
parse.y
View File

@ -6506,7 +6506,10 @@ parser_tokadd_string(struct parser_params *parser,
default: default:
if (c == -1) return -1; if (c == -1) return -1;
if (!ISASCII(c)) goto non_ascii; if (!ISASCII(c)) {
tokadd('\\');
goto non_ascii;
}
if (func & STR_FUNC_REGEXP) { if (func & STR_FUNC_REGEXP) {
pushback(c); pushback(c);
if ((c = tokadd_escape(&enc)) < 0) if ((c = tokadd_escape(&enc)) < 0)
@ -7594,6 +7597,7 @@ parser_yylex(struct parser_params *parser)
} }
else if (!lex_eol_p() && !(c = *lex_p, ISASCII(c))) { else if (!lex_eol_p() && !(c = *lex_p, ISASCII(c))) {
nextc(); nextc();
tokadd('\\');
if (tokadd_mbchar(c) == -1) return 0; if (tokadd_mbchar(c) == -1) return 0;
} }
else { else {

7
test/ruby/test_literal.rb
View File

@ -74,12 +74,13 @@ class TestRubyLiteral < Test::Unit::TestCase
end end
end end
end end
bug6069 = '[ruby-dev:45278]'
assert_equal "\x13", "\c\x33" assert_equal "\x13", "\c\x33"
assert_equal "\x13", "\C-\x33" assert_equal "\x13", "\C-\x33"
assert_equal "\xB3", "\M-\x33" assert_equal "\xB3", "\M-\x33"
assert_equal "\u201c", eval(%["\\\u{201c}"]), bug5262 assert_equal "\\\u201c", eval(%["\\\u{201c}"]), bug6069
assert_equal "\u201c".encode("euc-jp"), eval(%["\\\u{201c}"].encode("euc-jp")), bug5262 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")), bug5262 assert_equal "\\\u201c".encode("iso-8859-13"), eval(%["\\\u{201c}"].encode("iso-8859-13")), bug6069
end end
def test_dstring def test_dstring