summaryrefslogtreecommitdiffstats
path: root/lib/rexml
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-23 18:53:52 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-23 18:53:52 +0000
commit668d110f4864e2385f7a7e0e625adf59d85306b9 (patch)
tree2ad1bd217f82eccd88201b92537a0ff0d7453132 /lib/rexml
parentbe51d2e8f0881a3b662886e82cacf7a77ca2b76d (diff)
downloadruby-668d110f4864e2385f7a7e0e625adf59d85306b9.tar.gz
ruby-668d110f4864e2385f7a7e0e625adf59d85306b9.tar.xz
ruby-668d110f4864e2385f7a7e0e625adf59d85306b9.zip
* lib/rexml/text.rb, lib/rubygems/open-uri.rb, lib/open-uri.rb,
test/logger/test_logger.rb, test/ruby/test_regexp.rb: fix tests. [ruby-dev:33336] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rexml')
-rw-r--r--lib/rexml/text.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb
index c23cd17c0..73a72ae52 100644
--- a/lib/rexml/text.rb
+++ b/lib/rexml/text.rb
@@ -50,7 +50,7 @@ module REXML
| \xF0[\x90-\xBF][\x80-\xBF]{2} # planes 1-3
| [\xF1-\xF3][\x80-\xBF]{3} # planes 4-15
| \xF4[\x80-\x8F][\x80-\xBF]{2} # plane 16
- )*$/x;
+ )*$/nx;
end
# Constructor
@@ -139,7 +139,7 @@ module REXML
end
end
else
- string.scan(/[\x00-\x7F]|[\x80-\xBF][\xC0-\xF0]*|[\xC0-\xF0]/) do |c|
+ string.scan(/[\x00-\x7F]|[\x80-\xBF][\xC0-\xF0]*|[\xC0-\xF0]/n) do |c|
case c.unpack('U')
when *VALID_CHAR
else