diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-23 23:53:39 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-23 23:53:39 +0000 |
commit | b329509a08d9d9226e6fd3f54c79c84837cb9485 (patch) | |
tree | 96966f9d05040eb4a745a9c631d3d1b1d022a74f /parse.y | |
parent | 6cd700f3e9be25e270d11840b3d658ae35dcb0ca (diff) |
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
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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 { |