diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 6 | ||||
-rw-r--r-- | test/ruby/test_literal.rb | 7 | ||||
-rw-r--r-- | version.h | 6 |
4 files changed, 17 insertions, 7 deletions
@@ -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): @@ -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 @@ -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" |