summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-15 14:06:48 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-15 14:06:48 +0000
commit01309706ed03af816d207f1b7f0a1991155a19f7 (patch)
tree766860d0d994bd55ca3ca9d0a80ceb1adc376d7b
parentb57df3aaa7a1fbbd9dbc85be23ed0cda1a40d99e (diff)
downloadruby-01309706ed03af816d207f1b7f0a1991155a19f7.tar.gz
* lib/jcode.rb: Merge from 1.8: use Regexp.new()'s extra arguments
correctly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@4781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/jcode.rb6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c8de12009..ed979b776f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 15 23:04:25 2003 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/jcode.rb: Merge from 1.8: use Regexp.new()'s extra arguments
+ correctly.
+
Wed Oct 15 22:51:17 2003 Akinori MUSHA <knu@iDaemons.org>
* ext/digest/digest.c (rb_digest_base_s_new): Zero the newly
diff --git a/lib/jcode.rb b/lib/jcode.rb
index ab6ab60701..8064518017 100644
--- a/lib/jcode.rb
+++ b/lib/jcode.rb
@@ -19,9 +19,9 @@ class String
PATTERN_EUC = '[\xa1-\xfe][\xa1-\xfe]'
PATTERN_UTF8 = '[\xc0-\xdf][\x80-\xbf]|[\xe0-\xef][\x80-\xbf][\x80-\xbf]'
- RE_SJIS = Regexp.new(PATTERN_SJIS, 'n')
- RE_EUC = Regexp.new(PATTERN_EUC, 'n')
- RE_UTF8 = Regexp.new(PATTERN_UTF8, 'n')
+ RE_SJIS = Regexp.new(PATTERN_SJIS, 0, 'n')
+ RE_EUC = Regexp.new(PATTERN_EUC, 0, 'n')
+ RE_UTF8 = Regexp.new(PATTERN_UTF8, 0, 'n')
SUCC = {}
SUCC['s'] = Hash.new(1)