summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-28 02:40:30 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-28 02:40:30 +0000
commit191e9c2260f4f1a0f572fc4c29eae73c60270b3b (patch)
tree2f733c2e73a35457df2eb4dc97af957e0244801c
parentcf4ff3f16618a19179d7e9977c86ff1faa7dd799 (diff)
downloadruby-191e9c2260f4f1a0f572fc4c29eae73c60270b3b.tar.gz
ruby-191e9c2260f4f1a0f572fc4c29eae73c60270b3b.tar.xz
ruby-191e9c2260f4f1a0f572fc4c29eae73c60270b3b.zip
* parse.y (parser_tokadd_string): the byte after ``\'' may be a part of
multibyte character, so pushback it. [ruby-list:46416] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 411fa43e2..52cbe4ea6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 28 11:38:07 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * parse.y (parser_tokadd_string): the byte after ``\'' may be a part of
+ multibyte character, so pushback it. [ruby-list:46416]
+
Mon Sep 28 10:06:38 2009 NARUSE, Yui <naruse@ruby-lang.org>
* stringio/stringio.c (strio_read): set ASCII-8BIT encoding
diff --git a/parse.y b/parse.y
index cb7a13eb5..e325c5c72 100644
--- a/parse.y
+++ b/parse.y
@@ -5737,6 +5737,8 @@ parser_tokadd_string(struct parser_params *parser,
}
else if (c != term && !(paren && c == paren)) {
tokadd('\\');
+ pushback(c);
+ continue;
}
}
}