diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/date/format.rb | 12 |
2 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Sat Aug 11 07:34:10 2007 Tadayoshi Funaba <tadf@dotrb.org> + + * lib/date/format.rb: reverted some wrongly erased "o" options + (pointed out by nobu). + Tue Aug 7 14:58:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/pty/pty.c (establishShell): handshaking before close slave diff --git a/lib/date/format.rb b/lib/date/format.rb index ed7bb9e18b..809c2125f2 100644 --- a/lib/date/format.rb +++ b/lib/date/format.rb @@ -684,7 +684,7 @@ class Date private_class_method :s3e def self._parse_day(str, e) # :nodoc: - if str.sub!(/\b(#{Format::ABBR_DAYS.keys.join('|')})[^-\d\s]*/in, ' ') + if str.sub!(/\b(#{Format::ABBR_DAYS.keys.join('|')})[^-\d\s]*/ino, ' ') e.wday = Format::ABBR_DAYS[$1.downcase] true =begin @@ -780,7 +780,7 @@ class Date \s* ('?-?\d+(?:(?:st|nd|rd|th)\b)?) )? - /inx, + /inox, ' ') # ' s3e(e, $4, Format::ABBR_MONTHS[$2.downcase], $1, $3 && $3[0,1].downcase == 'b') @@ -799,7 +799,7 @@ class Date \s* ('?-?\d+) )? - /inx, + /inox, ' ') # ' s3e(e, $4, Format::ABBR_MONTHS[$1.downcase], $2, $3 && $3[0,1].downcase == 'b') @@ -854,11 +854,11 @@ class Date def self._parse_vms(str, e) # :nodoc: if str.sub!(/('?-?\d+)-(#{Format::ABBR_MONTHS.keys.join('|')})[^-]* - -('?-?\d+)/inx, ' ') + -('?-?\d+)/inox, ' ') s3e(e, $3, Format::ABBR_MONTHS[$2.downcase], $1) true elsif str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-]* - -('?-?\d+)(?:-('?-?\d+))?/inx, ' ') + -('?-?\d+)(?:-('?-?\d+))?/inox, ' ') s3e(e, $3, Format::ABBR_MONTHS[$1.downcase], $2) true end @@ -886,7 +886,7 @@ class Date end def self._parse_mon(str, e) # :nodoc: - if str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})\S*/in, ' ') + if str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})\S*/ino, ' ') e.mon = Format::ABBR_MONTHS[$1.downcase] true end |