From 502ca37dde288d20fed6e6ea34f4ab3299de7777 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 21 Dec 2022 14:07:54 +0900 Subject: [ruby/optparse] The encoding argument of `Regexp.new` has been ignored since 1.9 https://github.com/ruby/optparse/commit/766f567405 --- lib/optparse.rb | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/optparse.rb b/lib/optparse.rb index dc2b8a060f..b9126465e0 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -2084,10 +2084,23 @@ XXX f |= Regexp::IGNORECASE if /i/ =~ o f |= Regexp::MULTILINE if /m/ =~ o f |= Regexp::EXTENDED if /x/ =~ o - k = o.delete("imx") - k = nil if k.empty? + case o = o.delete("imx") + when "" + when "u" + s = s.encode(Encoding::UTF_8) + when "e" + s = s.encode(Encoding::EUC_JP) + when "s" + s = s.encode(Encoding::SJIS) + when "n" + f |= Regexp::NOENCODING + else + raise OptionParser::InvalidArgument, "unknown regexp option - #{o}" + end + else + s ||= all end - Regexp.new(s || all, f, k) + Regexp.new(s, f) end # -- cgit v1.2.3