rubysl-date 1.0.1 → 2.0.3

data/lib/date/delta/parser.rb

@@ -0,0 +1,301 @@
+#
+# DO NOT MODIFY!!!!
+# This file is automatically generated by racc 1.4.5
+# from racc grammer file "parser.ry".
+#
+
+require 'racc/parser'
+
+
+class Date
+
+  class Delta
+
+    class Parser < Racc::Parser
+
+module_eval <<'..end parser.ry modeval..id43bff5dec9', 'parser.ry', 42
+
+  def lookup(str)
+    t = str.downcase
+    k = UNITS4KEY[t]
+    return [:UNIT, k] if k
+    return [:AND, nil] if t == 'and'
+    return [:UNKNOWNWORD, nil]
+  end
+
+  def parse(str)
+    @q = []
+    until str.empty?
+      case str
+      when /\A\s+/
+      when /\AP(\d+y)?(\d+m)?(\d+d)?t?(\d+h)?(\d+m)?(\d+s)?(\d+w)?/i
+	y, m, d, h, min, s, w =
+	  [$1, $2, $3, $4, $5, $6, $7].collect{|x| x.to_i}
+	y *= UNITS4KEY['years']
+	m *= UNITS4KEY['months']
+	d *= UNITS4KEY['days']
+	h *= UNITS4KEY['hours']
+	min *= UNITS4KEY['minutes']
+	s *= UNITS4KEY['seconds']
+	w *= UNITS4KEY['weeks']
+	@q.push [:DURATION, y + m + d + h + min + s + w]
+      when /\A\d+/
+	@q.push [:DIGITS, $&.to_i]
+      when /\A[a-z]+/i
+	@q.push lookup($&)
+      when /\A.|\n/
+	@q.push [$&, $&]
+      end
+      str = $'
+    end
+    @q.push [false, false]
+    do_parse
+  end
+
+  def next_token
+    @q.shift
+  end
+
+..end parser.ry modeval..id43bff5dec9
+
+##### racc 1.4.5 generates ###
+
+racc_reduce_table = [
+ 0, 0, :racc_error,
+ 1, 16, :_reduce_none,
+ 1, 17, :_reduce_none,
+ 1, 17, :_reduce_none,
+ 3, 17, :_reduce_4,
+ 3, 17, :_reduce_5,
+ 3, 17, :_reduce_6,
+ 3, 17, :_reduce_7,
+ 3, 17, :_reduce_8,
+ 3, 17, :_reduce_9,
+ 3, 17, :_reduce_10,
+ 2, 17, :_reduce_11,
+ 2, 17, :_reduce_12,
+ 3, 17, :_reduce_13,
+ 2, 18, :_reduce_14,
+ 0, 20, :_reduce_15,
+ 1, 20, :_reduce_none,
+ 1, 19, :_reduce_none ]
+
+racc_reduce_n = 18
+
+racc_shift_n = 32
+
+racc_action_table = [
+    13,    14,    15,    16,    17,    18,    19,     4,    27,    23,
+     8,     9,     1,     4,    25,     2,     8,     9,     1,     4,
+    24,     2,     8,     9,     1,     4,    21,     2,     8,     9,
+     1,     4,    11,     2,     8,     9,     1,     4,    26,     2,
+     8,     9,     1,     4,   nil,     2,     8,     9,     1,     4,
+   nil,     2,     8,     9,     1,   nil,   nil,     2,    13,    14,
+    15,    16,    17,    18,    19,    13,    14,    15,    13,    14,
+    15,    13,    14,    15,    13,    14,    15 ]
+
+racc_action_check = [
+    10,    10,    10,    10,    10,    10,    10,    17,    15,    10,
+    17,    17,    17,    18,    13,    17,    18,    18,    18,     4,
+    11,    18,     4,     4,     4,     1,     9,     4,     1,     1,
+     1,     8,     3,     1,     8,     8,     8,    19,    14,     8,
+    19,    19,    19,     0,   nil,    19,     0,     0,     0,    16,
+   nil,     0,    16,    16,    16,   nil,   nil,    16,     5,     5,
+     5,     5,     5,     5,     5,    30,    30,    30,    28,    28,
+    28,    29,    29,    29,    31,    31,    31 ]
+
+racc_action_pointer = [
+    37,    19,   nil,    32,    13,    55,   nil,   nil,    25,    13,
+    -3,    20,   nil,     4,    28,    -2,    43,     1,     7,    31,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    65,    68,
+    62,    71 ]
+
+racc_action_default = [
+   -18,   -18,   -17,   -18,   -18,    -1,    -2,    -3,   -18,   -15,
+   -18,   -18,   -12,   -18,   -18,   -18,   -18,   -18,   -18,   -18,
+   -11,   -16,   -14,   -13,    32,   -10,    -8,    -9,    -4,    -5,
+    -6,    -7 ]
+
+racc_goto_table = [
+     5,    10,     3,    22,    12,   nil,   nil,   nil,    20,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    28,    29,    30,    31 ]
+
+racc_goto_check = [
+     2,     2,     1,     5,     2,   nil,   nil,   nil,     2,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     2,     2,     2,     2 ]
+
+racc_goto_pointer = [
+   nil,     2,     0,   nil,   nil,    -6 ]
+
+racc_goto_default = [
+   nil,   nil,   nil,     6,     7,   nil ]
+
+racc_token_table = {
+ false => 0,
+ Object.new => 1,
+ :UNARY => 2,
+ "^" => 3,
+ "*" => 4,
+ "/" => 5,
+ "+" => 6,
+ "," => 7,
+ :AND => 8,
+ "-" => 9,
+ :DIGITS => 10,
+ "(" => 11,
+ ")" => 12,
+ :UNIT => 13,
+ :DURATION => 14 }
+
+racc_use_result_var = true
+
+racc_nt_base = 15
+
+Racc_arg = [
+ racc_action_table,
+ racc_action_check,
+ racc_action_default,
+ racc_action_pointer,
+ racc_goto_table,
+ racc_goto_check,
+ racc_goto_default,
+ racc_goto_pointer,
+ racc_nt_base,
+ racc_reduce_table,
+ racc_token_table,
+ racc_shift_n,
+ racc_reduce_n,
+ racc_use_result_var ]
+
+Racc_token_to_s_table = [
+'$end',
+'error',
+'UNARY',
+'"^"',
+'"*"',
+'"/"',
+'"+"',
+'","',
+'AND',
+'"-"',
+'DIGITS',
+'"("',
+'")"',
+'UNIT',
+'DURATION',
+'$start',
+'stmt',
+'expr',
+'time',
+'iso',
+'unit']
+
+Racc_debug_parser = false
+
+##### racc system variables end #####
+
+ # reduce 0 omitted
+
+ # reduce 1 omitted
+
+ # reduce 2 omitted
+
+ # reduce 3 omitted
+
+module_eval <<'.,.,', 'parser.ry', 18
+  def _reduce_4( val, _values, result )
+result += val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 19
+  def _reduce_5( val, _values, result )
+result += val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 20
+  def _reduce_6( val, _values, result )
+result += val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 21
+  def _reduce_7( val, _values, result )
+result -= val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 22
+  def _reduce_8( val, _values, result )
+result *= val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 23
+  def _reduce_9( val, _values, result )
+result /= val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 24
+  def _reduce_10( val, _values, result )
+result **= val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 25
+  def _reduce_11( val, _values, result )
+result = -val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 26
+  def _reduce_12( val, _values, result )
+result = +val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 27
+  def _reduce_13( val, _values, result )
+result =  val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 30
+  def _reduce_14( val, _values, result )
+result = val[0] * val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'parser.ry', 33
+  def _reduce_15( val, _values, result )
+result = 1
+   result
+  end
+.,.,
+
+ # reduce 16 omitted
+
+ # reduce 17 omitted
+
+ def _reduce_none( val, _values, result )
+  result
+ end
+
+    end   # class Parser
+
+  end   # class Delta
+
+end   # class Date

data/lib/date/delta/parser.ry

@@ -0,0 +1,84 @@
+# parser.ry: Written by Tadayoshi Funaba 2006,2008,2009 -*- ruby -*-
+
+class Date::Delta::Parser
+
+  prechigh
+    nonassoc UNARY
+    left '^'
+    left '*' '/'
+    left '+' ',' AND '-'
+  preclow
+
+  rule
+
+  stmt	: expr
+	;
+
+  expr	: time
+	| iso
+	| expr '+' expr   {result += val[2]}
+	| expr ',' expr   {result += val[2]}
+	| expr AND expr   {result += val[2]}
+	| expr '-' expr   {result -= val[2]}
+	| expr '*' DIGITS {result *= val[2]}
+	| expr '/' DIGITS {result /= val[2]}
+	| expr '^' DIGITS {result **= val[2]}
+	| '-' expr =UNARY {result = -val[1]}
+	| '+' expr =UNARY {result = +val[1]}
+	| '(' expr ')'    {result =  val[1]}
+	;
+
+  time	: DIGITS unit {result = val[0] * val[1]}
+	;
+
+  unit	: {result = 1} | UNIT
+	;
+
+  iso	: DURATION
+	;
+
+---- header ----
+---- inner ----
+
+  def lookup(str)
+    t = str.downcase
+    k = UNITS4KEY[t]
+    return [:UNIT, k] if k
+    return [:AND, nil] if t == 'and'
+    return [:UNKNOWNWORD, nil]
+  end
+
+  def parse(str)
+    @q = []
+    until str.empty?
+      case str
+      when /\A\s+/
+      when /\AP(\d+y)?(\d+m)?(\d+d)?t?(\d+h)?(\d+m)?(\d+s)?(\d+w)?/i
+	y, m, d, h, min, s, w =
+	  [$1, $2, $3, $4, $5, $6, $7].collect{|x| x.to_i}
+	y *= UNITS4KEY['years']
+	m *= UNITS4KEY['months']
+	d *= UNITS4KEY['days']
+	h *= UNITS4KEY['hours']
+	min *= UNITS4KEY['minutes']
+	s *= UNITS4KEY['seconds']
+	w *= UNITS4KEY['weeks']
+	@q.push [:DURATION, y + m + d + h + min + s + w]
+      when /\A\d+/
+	@q.push [:DIGITS, $&.to_i]
+      when /\A[a-z]+/i
+	@q.push lookup($&)
+      when /\A.|\n/
+	@q.push [$&, $&]
+      end
+      str = $'
+    end
+    @q.push [false, false]
+    do_parse
+  end
+
+  def next_token
+    @q.shift
+  end
+
+---- footer ----

data/lib/date/format.rb

@@ -1,8 +1,6 @@
-# format.rb: Written by Tadayoshi Funaba 1999-2008
+# format.rb: Written by Tadayoshi Funaba 1999-2009
 # $Id: format.rb,v 2.43 2008-01-17 20:16:31+09 tadf Exp $
 
-require 'rational'
-
 class Date
 
   module Format # :nodoc:
@@ -178,7 +176,7 @@ class Date
   end
 
   def emit_w(e, w, f) # :nodoc:
-    f[:w] = w unless f[:w]
+    f[:w] = [f[:w], w].compact.max
     emit(e, f)
   end
 
@@ -223,26 +221,26 @@ class Date
   end
 
   private :emit, :emit_w, :emit_n, :emit_sn, :emit_z,
-          :emit_a, :emit_ad, :emit_au
+	  :emit_a, :emit_ad, :emit_au
 
   def strftime(fmt='%F')
-    fmt.gsub(/%([-_0^#]+)?(\d+)?([EO]?(?::{1,3}z|.))/m) do |m|
+    fmt.gsub(/%([-_0^#]+)?(\d+)?([EO]?(?::{1,3}z|.))/m) do
       f = {}
-      a = $&
+      m = $&
       s, w, c = $1, $2, $3
       if s
-        s.scan(/./) do |k|
-          case k
-          when '-'; f[:p] = '-'
-          when '_'; f[:p] = "\s"
-          when '0'; f[:p] = '0'
-          when '^'; f[:u] = true
-          when '#'; f[:x] = true
-          end
-        end
+	s.scan(/./) do |k|
+	  case k
+	  when '-'; f[:p] = '-'
+	  when '_'; f[:p] = "\s"
+	  when '0'; f[:p] = '0'
+	  when '^'; f[:u] = true
+	  when '#'; f[:x] = true
+	  end
+	end
       end
       if w
-        f[:w] = w.to_i
+	f[:w] = w.to_i
       end
       case c
       when 'A'; emit_ad(DAYNAMES[wday], 0, f)
@@ -255,11 +253,11 @@ class Date
       when 'd', 'Od'; emit_n(mday, 2, f)
       when 'e', 'Oe'; emit_a(mday, 2, f)
       when 'F'
-        if m == '%F'
-          format('%.4d-%02d-%02d', year, mon, mday) # 4p
-        else
-          emit_a(strftime('%Y-%m-%d'), 0, f)
-        end
+	if m == '%F'
+	  format('%.4d-%02d-%02d', year, mon, mday) # 4p
+	else
+	  emit_a(strftime('%Y-%m-%d'), 0, f)
+	end
       when 'G'; emit_sn(cwyear, 4, f)
       when 'g'; emit_n(cwyear % 100, 2, f)
       when 'H', 'OH'; emit_n(hour, 2, f)
@@ -268,33 +266,39 @@ class Date
       when 'j'; emit_n(yday, 3, f)
       when 'k'; emit_a(hour, 2, f)
       when 'L'
-        emit_n((sec_fraction / MILLISECONDS_IN_DAY).floor, 3, f)
+	f[:p] = nil
+	w = f[:w] || 3
+	u = 10**w
+	emit_n((sec_fraction * u).floor, w, f)
       when 'l'; emit_a((hour % 12).nonzero? || 12, 2, f)
       when 'M', 'OM'; emit_n(min, 2, f)
       when 'm', 'Om'; emit_n(mon, 2, f)
       when 'N'
-        emit_n((sec_fraction / NANOSECONDS_IN_DAY).floor, 9, f)
-      when 'n'; "\n"
+	f[:p] = nil
+	w = f[:w] || 9
+	u = 10**w
+	emit_n((sec_fraction * u).floor, w, f)
+      when 'n'; emit_a("\n", 0, f)
       when 'P'; emit_ad(strftime('%p').downcase, 0, f)
       when 'p'; emit_au(if hour < 12 then 'AM' else 'PM' end, 0, f)
       when 'Q'
-        s = ((ajd - UNIX_EPOCH_IN_AJD) / MILLISECONDS_IN_DAY).round
-        emit_sn(s, 1, f)
+	s = ((ajd - UNIX_EPOCH_IN_AJD) / MILLISECONDS_IN_DAY).round
+	emit_sn(s, 1, f)
       when 'R'; emit_a(strftime('%H:%M'), 0, f)
       when 'r'; emit_a(strftime('%I:%M:%S %p'), 0, f)
       when 'S', 'OS'; emit_n(sec, 2, f)
       when 's'
-        s = ((ajd - UNIX_EPOCH_IN_AJD) / SECONDS_IN_DAY).round
-        emit_sn(s, 1, f)
+	s = ((ajd - UNIX_EPOCH_IN_AJD) / SECONDS_IN_DAY).round
+	emit_sn(s, 1, f)
       when 'T'
-        if m == '%T'
-          format('%02d:%02d:%02d', hour, min, sec) # 4p
-        else
-          emit_a(strftime('%H:%M:%S'), 0, f)
-        end
-      when 't'; "\t"
+	if m == '%T'
+	  format('%02d:%02d:%02d', hour, min, sec) # 4p
+	else
+	  emit_a(strftime('%H:%M:%S'), 0, f)
+	end
+      when 't'; emit_a("\t", 0, f)
       when 'U', 'W', 'OU', 'OW'
-        emit_n(if c[-1,1] == 'U' then wnum0 else wnum1 end, 2, f)
+	emit_n(if c[-1,1] == 'U' then wnum0 else wnum1 end, 2, f)
       when 'u', 'Ou'; emit_n(cwday, 1, f)
       when 'V', 'OV'; emit_n(cweek, 2, f)
       when 'v'; emit_a(strftime('%e-%b-%Y'), 0, f)
@@ -305,55 +309,40 @@ class Date
       when 'y', 'Ey', 'Oy'; emit_n(year % 100, 2, f)
       when 'Z'; emit_au(strftime('%:z'), 0, f)
       when /\A(:{0,3})z/
-        t = $1.size
-        sign = if offset < 0 then -1 else +1 end
-        fr = offset.abs
-        ss = fr.div(SECONDS_IN_DAY) # 4p
-        hh, ss = ss.divmod(3600)
-        mm, ss = ss.divmod(60)
-        if t == 3
-          if    ss.nonzero? then t =  2
-          elsif mm.nonzero? then t =  1
-          else                   t = -1
-          end
-        end
-        case t
-        when -1
-          tail = []
-          sep = ''
-        when 0
-          f[:w] -= 2 if f[:w]
-          tail = ['%02d' % mm]
-          sep = ''
-        when 1
-          f[:w] -= 3 if f[:w]
-          tail = ['%02d' % mm]
-          sep = ':'
-        when 2
-          f[:w] -= 6 if f[:w]
-          tail = ['%02d' % mm, '%02d' % ss]
-          sep = ':'
-        end
-        ([emit_z(sign * hh, 2, f)] + tail).join(sep)
+	t = $1.size
+	sign = if offset < 0 then -1 else +1 end
+	fr = offset.abs
+	ss = fr.div(SECONDS_IN_DAY) # 4p
+	hh, ss = ss.divmod(3600)
+	mm, ss = ss.divmod(60)
+	if t == 3
+	  if    ss.nonzero? then t =  2
+	  elsif mm.nonzero? then t =  1
+	  else                   t = -1
+	  end
+	end
+	case t
+	when -1
+	  tail = []
+	  sep = ''
+	when 0
+	  f[:w] -= 2 if f[:w]
+	  tail = ['%02d' % mm]
+	  sep = ''
+	when 1
+	  f[:w] -= 3 if f[:w]
+	  tail = ['%02d' % mm]
+	  sep = ':'
+	when 2
+	  f[:w] -= 6 if f[:w]
+	  tail = ['%02d' % mm, '%02d' % ss]
+	  sep = ':'
+	end
+	([emit_z(sign * hh, 2, f)] + tail).join(sep)
       when '%'; emit_a('%', 0, f)
       when '+'; emit_a(strftime('%a %b %e %H:%M:%S %Z %Y'), 0, f)
-      when '1'
-        if $VERBOSE
-          warn("warning: strftime: %1 is deprecated; forget this")
-        end
-        emit_n(jd, 1, f)
-      when '2'
-        if $VERBOSE
-          warn("warning: strftime: %2 is deprecated; use '%Y-%j'")
-        end
-        emit_a(strftime('%Y-%j'), 0, f)
-      when '3'
-        if $VERBOSE
-          warn("warning: strftime: %3 is deprecated; use '%F'")
-        end
-        emit_a(strftime('%F'), 0, f)
       else
-        a
+	m
       end
     end
   end
@@ -364,40 +353,44 @@ class Date
 
   alias_method :ctime, :asctime
 
-=begin
   def iso8601() strftime('%F') end
 
   def rfc3339() iso8601 end
 
+  def xmlschema() iso8601 end # :nodoc:
+
   def rfc2822() strftime('%a, %-d %b %Y %T %z') end
 
   alias_method :rfc822, :rfc2822
 
+  def httpdate() new_offset(0).strftime('%a, %d %b %Y %T GMT') end # :nodoc:
+
   def jisx0301
     if jd < 2405160
       iso8601
     else
       case jd
       when 2405160...2419614
-        g = 'M%02d' % (year - 1867)
+	g = 'M%02d' % (year - 1867)
       when 2419614...2424875
-        g = 'T%02d' % (year - 1911)
+	g = 'T%02d' % (year - 1911)
       when 2424875...2447535
-        g = 'S%02d' % (year - 1925)
+	g = 'S%02d' % (year - 1925)
       else
-        g = 'H%02d' % (year - 1988)
+	g = 'H%02d' % (year - 1988)
       end
       g + strftime('.%m.%d')
     end
   end
 
+=begin
   def beat(n=0)
     i, f = (new_offset(HOURS_IN_DAY).day_fraction * 1000).divmod(1)
     ('@%03d' % i) +
       if n < 1
-        ''
+	''
       else
-        '.%0*d' % [n, (f / Rational(1, 10**n)).round]
+	'.%0*d' % [n, (f / Rational(1, 10**n)).round]
       end
   end
 =end
@@ -412,198 +405,181 @@ class Date
     fmt.scan(/%([EO]?(?::{1,3}z|.))|(.)/m) do |s, c|
       a = $&
       if s
-        case s
-        when 'A', 'a'
-          return unless str.sub!(/\A(#{Format::DAYS.keys.join('|')})/io, '') ||
-        		str.sub!(/\A(#{Format::ABBR_DAYS.keys.join('|')})/io, '')
-          val = Format::DAYS[$1.downcase] || Format::ABBR_DAYS[$1.downcase]
-          return unless val
-          e[:wday] = val
-        when 'B', 'b', 'h'
-          return unless str.sub!(/\A(#{Format::MONTHS.keys.join('|')})/io, '') ||
-        		str.sub!(/\A(#{Format::ABBR_MONTHS.keys.join('|')})/io, '')
-          val = Format::MONTHS[$1.downcase] || Format::ABBR_MONTHS[$1.downcase]
-          return unless val
-          e.mon = val
-        when 'C', 'EC'
-          return unless str.sub!(if num_pattern?($')
-        			 then /\A([-+]?\d{1,2})/
-        			 else /\A([-+]?\d{1,})/
-        			 end, '')
-          val = $1.to_i
-          e._cent = val
-        when 'c', 'Ec'
-          return unless _strptime_i(str, '%a %b %e %H:%M:%S %Y', e)
-        when 'D'
-          return unless _strptime_i(str, '%m/%d/%y', e)
-        when 'd', 'e', 'Od', 'Oe'
-          return unless str.sub!(/\A( \d|\d{1,2})/, '')
-          val = $1.to_i
-          return unless (1..31) === val
-          e.mday = val
-        when 'F'
-          return unless _strptime_i(str, '%Y-%m-%d', e)
-        when 'G'
-          return unless str.sub!(if num_pattern?($')
-        			 then /\A([-+]?\d{1,4})/
-        			 else /\A([-+]?\d{1,})/
-        			 end, '')
-          val = $1.to_i
-          e[:cwyear] = val
-        when 'g'
-          return unless str.sub!(/\A(\d{1,2})/, '')
-          val = $1.to_i
-          return unless (0..99) === val
-          e[:cwyear] = val
-          e._cent ||= if val >= 69 then 19 else 20 end
-        when 'H', 'k', 'OH'
-          return unless str.sub!(/\A( \d|\d{1,2})/, '')
-          val = $1.to_i
-          return unless (0..24) === val
-          e.hour = val
-        when 'I', 'l', 'OI'
-          return unless str.sub!(/\A( \d|\d{1,2})/, '')
-          val = $1.to_i
-          return unless (1..12) === val
-          e.hour = val
-        when 'j'
-          return unless str.sub!(/\A(\d{1,3})/, '')
-          val = $1.to_i
-          return unless (1..366) === val
-          e[:yday] = val
-        when 'L'
-          return unless str.sub!(if num_pattern?($')
-        			 then /\A([-+]?\d{1,3})/
-        			 else /\A([-+]?\d{1,})/
-        			 end, '')
+	case s
+	when 'A', 'a'
+	  return unless str.sub!(/\A(#{Format::DAYS.keys.join('|')})/io, '') ||
+			str.sub!(/\A(#{Format::ABBR_DAYS.keys.join('|')})/io, '')
+	  val = Format::DAYS[$1.downcase] || Format::ABBR_DAYS[$1.downcase]
+	  return unless val
+	  e[:wday] = val
+	when 'B', 'b', 'h'
+	  return unless str.sub!(/\A(#{Format::MONTHS.keys.join('|')})/io, '') ||
+			str.sub!(/\A(#{Format::ABBR_MONTHS.keys.join('|')})/io, '')
+	  val = Format::MONTHS[$1.downcase] || Format::ABBR_MONTHS[$1.downcase]
+	  return unless val
+	  e.mon = val
+	when 'C', 'EC'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,2})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
+	  val = $1.to_i
+	  e._cent = val
+	when 'c', 'Ec'
+	  return unless _strptime_i(str, '%a %b %e %H:%M:%S %Y', e)
+	when 'D'
+	  return unless _strptime_i(str, '%m/%d/%y', e)
+	when 'd', 'e', 'Od', 'Oe'
+	  return unless str.sub!(/\A( \d|\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (1..31) === val
+	  e.mday = val
+	when 'F'
+	  return unless _strptime_i(str, '%Y-%m-%d', e)
+	when 'G'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,4})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
+	  val = $1.to_i
+	  e[:cwyear] = val
+	when 'g'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..99) === val
+	  e[:cwyear] = val
+	  e._cent ||= if val >= 69 then 19 else 20 end
+	when 'H', 'k', 'OH'
+	  return unless str.sub!(/\A( \d|\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..24) === val
+	  e.hour = val
+	when 'I', 'l', 'OI'
+	  return unless str.sub!(/\A( \d|\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (1..12) === val
+	  e.hour = val
+	when 'j'
+	  return unless str.sub!(/\A(\d{1,3})/, '')
+	  val = $1.to_i
+	  return unless (1..366) === val
+	  e[:yday] = val
+	when 'L'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,3})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
 #	  val = Rational($1.to_i, 10**3)
-          val = Rational($1.to_i, 10**$1.size)
-          e.sec_fraction = val
-        when 'M', 'OM'
-          return unless str.sub!(/\A(\d{1,2})/, '')
-          val = $1.to_i
-          return unless (0..59) === val
-          e.min = val
-        when 'm', 'Om'
-          return unless str.sub!(/\A(\d{1,2})/, '')
-          val = $1.to_i
-          return unless (1..12) === val
-          e.mon = val
-        when 'N'
-          return unless str.sub!(if num_pattern?($')
-        			 then /\A([-+]?\d{1,9})/
-        			 else /\A([-+]?\d{1,})/
-        			 end, '')
+	  val = Rational($1.to_i, 10**$1.size)
+	  e.sec_fraction = val
+	when 'M', 'OM'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..59) === val
+	  e.min = val
+	when 'm', 'Om'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (1..12) === val
+	  e.mon = val
+	when 'N'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,9})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
 #	  val = Rational($1.to_i, 10**9)
-          val = Rational($1.to_i, 10**$1.size)
-          e.sec_fraction = val
-        when 'n', 't'
-          return unless _strptime_i(str, "\s", e)
-        when 'P', 'p'
-          return unless str.sub!(/\A([ap])(?:m\b|\.m\.)/i, '')
-          e._merid = if $1.downcase == 'a' then 0 else 12 end
-        when 'Q'
-          return unless str.sub!(/\A(-?\d{1,})/, '')
-          val = Rational($1.to_i, 10**3)
-          e[:seconds] = val
-        when 'R'
-          return unless _strptime_i(str, '%H:%M', e)
-        when 'r'
-          return unless _strptime_i(str, '%I:%M:%S %p', e)
-        when 'S', 'OS'
-          return unless str.sub!(/\A(\d{1,2})/, '')
-          val = $1.to_i
-          return unless (0..60) === val
-          e.sec = val
-        when 's'
-          return unless str.sub!(/\A(-?\d{1,})/, '')
-          val = $1.to_i
-          e[:seconds] = val
-        when 'T'
-          return unless _strptime_i(str, '%H:%M:%S', e)
-        when 'U', 'W', 'OU', 'OW'
-          return unless str.sub!(/\A(\d{1,2})/, '')
-          val = $1.to_i
-          return unless (0..53) === val
-          if s[-1,1] == 'U'
-            e[:wnum0] = val
-          else
-            e[:wnum1] = val
-          end
-        when 'u', 'Ou'
-          return unless str.sub!(/\A(\d{1})/, '')
-          val = $1.to_i
-          return unless (1..7) === val
-          e[:cwday] = val
-        when 'V', 'OV'
-          return unless str.sub!(/\A(\d{1,2})/, '')
-          val = $1.to_i
-          return unless (1..53) === val
-          e[:cweek] = val
-        when 'v'
-          return unless _strptime_i(str, '%e-%b-%Y', e)
-        when 'w'
-          return unless str.sub!(/\A(\d{1})/, '')
-          val = $1.to_i
-          return unless (0..6) === val
-          e[:wday] = val
-        when 'X', 'EX'
-          return unless _strptime_i(str, '%H:%M:%S', e)
-        when 'x', 'Ex'
-          return unless _strptime_i(str, '%m/%d/%y', e)
-        when 'Y', 'EY'
-          return unless str.sub!(if num_pattern?($')
-        			 then /\A([-+]?\d{1,4})/
-        			 else /\A([-+]?\d{1,})/
-        			 end, '')
-          val = $1.to_i
-          e.year = val
-        when 'y', 'Ey', 'Oy'
-          return unless str.sub!(/\A(\d{1,2})/, '')
-          val = $1.to_i
-          return unless (0..99) === val
-          e.year = val
-          e._cent ||= if val >= 69 then 19 else 20 end
-        when 'Z', /\A:{0,3}z/
-          return unless str.sub!(/\A((?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
-        			    |[[:alpha:].\s]+(?:standard|daylight)\s+time\b
-        			    |[[:alpha:]]+(?:\s+dst)?\b
-        			    )/ix, '')
-          val = $1
-          e.zone = val
-          offset = zone_to_diff(val)
-          e.offset = offset
-        when '%'
-          return unless str.sub!(/\A%/, '')
-        when '+'
-          return unless _strptime_i(str, '%a %b %e %H:%M:%S %Z %Y', e)
-        when '1'
-          if $VERBOSE
-            warn("warning: strptime: %1 is deprecated; forget this")
-          end
-          return unless str.sub!(/\A(\d+)/, '')
-          val = $1.to_i
-          e[:jd] = val
-        when '2'
-          if $VERBOSE
-            warn("warning: strptime: %2 is deprecated; use '%Y-%j'")
-          end
-          return unless _strptime_i(str, '%Y-%j', e)
-        when '3'
-          if $VERBOSE
-            warn("warning: strptime: %3 is deprecated; use '%F'")
-          end
-          return unless _strptime_i(str, '%F', e)
-        else
-          return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
-        end
+	  val = Rational($1.to_i, 10**$1.size)
+	  e.sec_fraction = val
+	when 'n', 't'
+	  return unless _strptime_i(str, "\s", e)
+	when 'P', 'p'
+	  return unless str.sub!(/\A([ap])(?:m\b|\.m\.)/i, '')
+	  e._merid = if $1.downcase == 'a' then 0 else 12 end
+	when 'Q'
+	  return unless str.sub!(/\A(-?\d{1,})/, '')
+	  val = Rational($1.to_i, 10**3)
+	  e[:seconds] = val
+	when 'R'
+	  return unless _strptime_i(str, '%H:%M', e)
+	when 'r'
+	  return unless _strptime_i(str, '%I:%M:%S %p', e)
+	when 'S', 'OS'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..60) === val
+	  e.sec = val
+	when 's'
+	  return unless str.sub!(/\A(-?\d{1,})/, '')
+	  val = $1.to_i
+	  e[:seconds] = val
+	when 'T'
+	  return unless _strptime_i(str, '%H:%M:%S', e)
+	when 'U', 'W', 'OU', 'OW'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..53) === val
+    if s[-1,1] == 'U'
+      e[:wnum0] = val
+    else
+      e[:wnum1] = val
+    end
+	when 'u', 'Ou'
+	  return unless str.sub!(/\A(\d{1})/, '')
+	  val = $1.to_i
+	  return unless (1..7) === val
+	  e[:cwday] = val
+	when 'V', 'OV'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (1..53) === val
+	  e[:cweek] = val
+	when 'v'
+	  return unless _strptime_i(str, '%e-%b-%Y', e)
+	when 'w'
+	  return unless str.sub!(/\A(\d{1})/, '')
+	  val = $1.to_i
+	  return unless (0..6) === val
+	  e[:wday] = val
+	when 'X', 'EX'
+	  return unless _strptime_i(str, '%H:%M:%S', e)
+	when 'x', 'Ex'
+	  return unless _strptime_i(str, '%m/%d/%y', e)
+	when 'Y', 'EY'
+	  return unless str.sub!(if num_pattern?($')
+				 then /\A([-+]?\d{1,4})/
+				 else /\A([-+]?\d{1,})/
+				 end, '')
+	  val = $1.to_i
+	  e.year = val
+	when 'y', 'Ey', 'Oy'
+	  return unless str.sub!(/\A(\d{1,2})/, '')
+	  val = $1.to_i
+	  return unless (0..99) === val
+	  e.year = val
+	  e._cent ||= if val >= 69 then 19 else 20 end
+	when 'Z', /\A:{0,3}z/
+	  return unless str.sub!(/\A((?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
+				    |[[:alpha:].\s]+(?:standard|daylight)\s+time\b
+				    |[[:alpha:]]+(?:\s+dst)?\b
+				    )/ix, '')
+	  val = $1
+	  e.zone = val
+	  offset = zone_to_diff(val)
+	  e.offset = offset
+	when '%'
+	  return unless str.sub!(/\A%/, '')
+	when '+'
+	  return unless _strptime_i(str, '%a %b %e %H:%M:%S %Z %Y', e)
+	else
+	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
+	end
       else
-        case c
-        when /\A[\s\v]/
-          str.sub!(/\A[\s\v]+/, '')
-        else
-          return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
-        end
+	case c
+	when /\A\s/
+	  str.sub!(/\A\s+/, '')
+	else
+	  return unless str.sub!(Regexp.new('\\A' + Regexp.quote(a)), '')
+	end
       end
     end
   end
@@ -613,22 +589,21 @@ class Date
   def self._strptime(str, fmt='%F')
     str = str.dup
     e = Format::Bag.new
-
     return unless _strptime_i(str, fmt, e)
 
     if e._cent
       if e[:cwyear]
-        e[:cwyear] += e._cent * 100
+	e[:cwyear] += e._cent * 100
       end
       if e.year
-        e.year += e._cent * 100
+	e.  year += e._cent * 100
       end
     end
 
     if e._merid
       if e.hour
-        e.hour %= 12
-        e.hour += e._merid
+	e.hour %= 12
+	e.hour += e._merid
       end
     end
 
@@ -650,42 +625,42 @@ class Date
 
     if y == nil
       if d && d.size > 2
-        y = d
-        d = nil
+	y = d
+	d = nil
       end
       if d && d[0,1] == "'"
-        y = d
-        d = nil
+	y = d
+	d = nil
       end
     end
 
     if y
       y.scan(/(\d+)(.+)?/)
       if $2
-        y, d = d, $1
+	y, d = d, $1
       end
     end
 
     if m
       if m[0,1] == "'" || m.size > 2
-        y, m, d = m, d, y # us -> be
+	y, m, d = m, d, y # us -> be
       end
     end
 
     if d
       if d[0,1] == "'" || d.size > 2
-        y, d = d, y
+	y, d = d, y
       end
     end
 
     if y
       y =~ /([-+])?(\d+)/
       if $1 || $2.size > 2
-        c = false
+	c = false
       end
       iy = $&.to_i
       if bc
-        iy = -iy + 1
+	iy = -iy + 1
       end
       e.year = iy
     end
@@ -709,12 +684,12 @@ class Date
   private_class_method :s3e
 
   def self._parse_day(str, e) # :nodoc:
-    if str.sub!(/\b(#{Format::ABBR_DAYS.keys.join('|')})[^-\d\s]*/ino, ' ')
+    if str.sub!(/\b(#{Format::ABBR_DAYS.keys.join('|')})[^-\d\s]*/io, ' ')
       e[:wday] = Format::ABBR_DAYS[$1.downcase]
       true
 =begin
-    elsif str.sub!(/\b(?!\dth)(su|mo|tu|we|th|fr|sa)\b/in, ' ')
-      e[:wday] = %w(su mo tu we th fr sa).index($1.downcase)
+    elsif str.sub!(/\b(?!\dth)(su|mo|tu|we|th|fr|sa)\b/i, ' ')
+      e.wday = %w(su mo tu we th fr sa).index($1.downcase)
       true
 =end
     end
@@ -722,45 +697,45 @@ class Date
 
   def self._parse_time(str, e) # :nodoc:
     if str.sub!(
-        	/(
-        	   (?:
-        	     \d+\s*:\s*\d+
-        	     (?:
-        	       \s*:\s*\d+(?:[,.]\d*)?
-        	     )?
-        	   |
-        	     \d+\s*h(?:\s*\d+m?(?:\s*\d+s?)?)?
-        	   )
-        	   (?:
-        	     \s*
-        	     [ap](?:m\b|\.m\.)
-        	   )?
-        	 |
-        	   \d+\s*[ap](?:m\b|\.m\.)
-        	 )
-        	 (?:
-        	   \s*
-        	   (
-        	     (?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
-        	   |
-        	     [[:alpha:].\s]+(?:standard|daylight)\stime\b
-        	   |
-        	     [[:alpha:]]+(?:\sdst)?\b
-        	   )
-        	 )?
-        	/inx,
-        	' ')
+		/(
+		   (?:
+		     \d+\s*:\s*\d+
+		     (?:
+		       \s*:\s*\d+(?:[,.]\d*)?
+		     )?
+		   |
+		     \d+\s*h(?:\s*\d+m?(?:\s*\d+s?)?)?
+		   )
+		   (?:
+		     \s*
+		     [ap](?:m\b|\.m\.)
+		   )?
+		 |
+		   \d+\s*[ap](?:m\b|\.m\.)
+		 )
+		 (?:
+		   \s*
+		   (
+		     (?:gmt|utc?)?[-+]\d+(?:[,.:]\d+(?::\d+)?)?
+		   |
+		     [[:alpha:].\s]+(?:standard|daylight)\stime\b
+		   |
+		     [[:alpha:]]+(?:\sdst)?\b
+		   )
+		 )?
+		/ix,
+		' ')
 
       t = $1
       e.zone = $2 if $2
 
       t =~ /\A(\d+)h?
-              (?:\s*:?\s*(\d+)m?
-        	(?:
-        	  \s*:?\s*(\d+)(?:[,.](\d+))?s?
-        	)?
-              )?
-            (?:\s*([ap])(?:m\b|\.m\.))?/inx
+	      (?:\s*:?\s*(\d+)m?
+		(?:
+		  \s*:?\s*(\d+)(?:[,.](\d+))?s?
+		)?
+	      )?
+	    (?:\s*([ap])(?:m\b|\.m\.))?/ix
 
       e.hour = $1.to_i
       e.min = $2.to_i if $2
@@ -768,10 +743,10 @@ class Date
       e.sec_fraction = Rational($4.to_i, 10**$4.size) if $4
 
       if $5
-        e.hour %= 12
-        if $5.downcase == 'p'
-          e.hour += 12
-        end
+	e.hour %= 12
+	if $5.downcase == 'p'
+	  e.hour += 12
+	end
       end
       true
     end
@@ -796,85 +771,85 @@ class Date
 
   def self._parse_eu(str, e) # :nodoc:
     if str.sub!(
-        	/'?(\d+)[^-\d\s]*
-        	 \s*
-        	 (#{Format::ABBR_MONTHS.keys.join('|')})[^-\d\s']*
-        	 (?:
-        	   \s*
-        	   (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
-        	   \s*
-        	   ('?-?\d+(?:(?:st|nd|rd|th)\b)?)
-        	 )?
-        	/inox,
-        	' ') # '
+		/'?(\d+)[^-\d\s]*
+		 \s*
+		 (#{Format::ABBR_MONTHS.keys.join('|')})[^-\d\s']*
+		 (?:
+		   \s*
+		   (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
+		   \s*
+		   ('?-?\d+(?:(?:st|nd|rd|th)\b)?)
+		 )?
+		/iox,
+		' ') # '
       s3e(e, $4, Format::ABBR_MONTHS[$2.downcase], $1,
-          $3 && $3[0,1].downcase == 'b')
+	  $3 && $3[0,1].downcase == 'b')
       true
     end
   end
 
   def self._parse_us(str, e) # :nodoc:
     if str.sub!(
-        	/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-\d\s']*
-        	 \s*
-        	 ('?\d+)[^-\d\s']*
-        	 (?:
-        	   \s*
-        	   (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
-        	   \s*
-        	   ('?-?\d+)
-        	 )?
-        	/inox,
-        	' ') # '
+		/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-\d\s']*
+		 \s*
+		 ('?\d+)[^-\d\s']*
+		 (?:
+		   \s*
+		   (c(?:e|\.e\.)|b(?:ce|\.c\.e\.)|a(?:d|\.d\.)|b(?:c|\.c\.))?
+		   \s*
+		   ('?-?\d+)
+		 )?
+		/iox,
+		' ') # '
       s3e(e, $4, Format::ABBR_MONTHS[$1.downcase], $2,
-          $3 && $3[0,1].downcase == 'b')
+	  $3 && $3[0,1].downcase == 'b')
       true
     end
   end
 
   def self._parse_iso(str, e) # :nodoc:
-    if str.sub!(/('?[-+]?\d+)-(\d+)-('?-?\d+)/n, ' ')
+    if str.sub!(/('?[-+]?\d+)-(\d+)-('?-?\d+)/, ' ')
       s3e(e, $1, $2, $3)
       true
     end
   end
 
   def self._parse_iso2(str, e) # :nodoc:
-    if str.sub!(/\b(\d{2}|\d{4})?-?w(\d{2})(?:-?(\d))?\b/in, ' ')
+    if str.sub!(/\b(\d{2}|\d{4})?-?w(\d{2})(?:-?(\d))?\b/i, ' ')
       e[:cwyear] = $1.to_i if $1
       e[:cweek] = $2.to_i
       e[:cwday] = $3.to_i if $3
       true
-    elsif str.sub!(/-w-(\d)\b/in, ' ')
+    elsif str.sub!(/-w-(\d)\b/i, ' ')
       e[:cwday] = $1.to_i
       true
-    elsif str.sub!(/--(\d{2})?-(\d{2})\b/n, ' ')
+    elsif str.sub!(/--(\d{2})?-(\d{2})\b/, ' ')
       e.mon = $1.to_i if $1
       e.mday = $2.to_i
       true
-    elsif str.sub!(/--(\d{2})(\d{2})?\b/n, ' ')
+    elsif str.sub!(/--(\d{2})(\d{2})?\b/, ' ')
       e.mon = $1.to_i
       e.mday = $2.to_i if $2
       true
-    elsif /[,.](\d{2}|\d{4})-\d{3}\b/n !~ str &&
-        str.sub!(/\b(\d{2}|\d{4})-(\d{3})\b/n, ' ')
+    elsif /[,.](\d{2}|\d{4})-\d{3}\b/ !~ str &&
+	str.sub!(/\b(\d{2}|\d{4})-(\d{3})\b/, ' ')
       e.year = $1.to_i
       e[:yday] = $2.to_i
       true
-    elsif /\d-\d{3}\b/n !~ str &&
-        str.sub!(/\b-(\d{3})\b/n, ' ')
+    elsif /\d-\d{3}\b/ !~ str &&
+	str.sub!(/\b-(\d{3})\b/, ' ')
       e[:yday] = $1.to_i
       true
     end
   end
 
   def self._parse_jis(str, e) # :nodoc:
-    if str.sub!(/\b([mtsh])(\d+)\.(\d+)\.(\d+)/in, ' ')
+    if str.sub!(/\b([mtsh])(\d+)\.(\d+)\.(\d+)/i, ' ')
       era = { 'm'=>1867,
-              't'=>1911,
-              's'=>1925,
-              'h'=>1988
-          }[$1.downcase]
+	      't'=>1911,
+	      's'=>1925,
+	      'h'=>1988
+	  }[$1.downcase]
       e.year = $2.to_i + era
       e.mon = $3.to_i
       e.mday = $4.to_i
@@ -884,46 +859,46 @@ class Date
 
   def self._parse_vms(str, e) # :nodoc:
     if str.sub!(/('?-?\d+)-(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
-        	-('?-?\d+)/inox, ' ')
+		-('?-?\d+)/iox, ' ')
       s3e(e, $3, Format::ABBR_MONTHS[$2.downcase], $1)
       true
     elsif str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})[^-]*
-        	-('?-?\d+)(?:-('?-?\d+))?/inox, ' ')
+		-('?-?\d+)(?:-('?-?\d+))?/iox, ' ')
       s3e(e, $3, Format::ABBR_MONTHS[$1.downcase], $2)
       true
     end
   end
 
   def self._parse_sla(str, e) # :nodoc:
-    if str.sub!(%r|('?-?\d+)/\s*('?\d+)(?:\D\s*('?-?\d+))?|n, ' ') # '
-      s3e(e, $3, $1, $2)
+    if str.sub!(%r|('?-?\d+)/\s*('?\d+)(?:\D\s*('?-?\d+))?|, ' ') # '
+      s3e(e, $1, $2, $3)
       true
     end
   end
 
   def self._parse_dot(str, e) # :nodoc:
-    if str.sub!(%r|('?-?\d+)\.\s*('?\d+)\.\s*('?-?\d+)|n, ' ') # '
+    if str.sub!(%r|('?-?\d+)\.\s*('?\d+)\.\s*('?-?\d+)|, ' ') # '
       s3e(e, $1, $2, $3)
       true
     end
   end
 
   def self._parse_year(str, e) # :nodoc:
-    if str.sub!(/'(\d+)\b/n, ' ')
+    if str.sub!(/'(\d+)\b/, ' ')
       e.year = $1.to_i
       true
     end
   end
 
   def self._parse_mon(str, e) # :nodoc:
-    if str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})\S*/ino, ' ')
+    if str.sub!(/\b(#{Format::ABBR_MONTHS.keys.join('|')})\S*/io, ' ')
       e.mon = Format::ABBR_MONTHS[$1.downcase]
       true
     end
   end
 
   def self._parse_mday(str, e) # :nodoc:
-    if str.sub!(/(\d+)(st|nd|rd|th)\b/in, ' ')
+    if str.sub!(/(\d+)(st|nd|rd|th)\b/i, ' ')
       e.mday = $1.to_i
       true
     end
@@ -931,150 +906,150 @@ class Date
 
   def self._parse_ddd(str, e) # :nodoc:
     if str.sub!(
-        	/([-+]?)(\d{2,14})
-        	  (?:
-        	    \s*
-        	    t?
-        	    \s*
-        	    (\d{2,6})?(?:[,.](\d*))?
-        	  )?
-        	  (?:
-        	    \s*
-        	    (
-        	      z\b
-        	    |
-        	      [-+]\d{1,4}\b
-        	    |
-        	      \[[-+]?\d[^\]]*\]
-        	    )
-        	  )?
-        	/inx,
-        	' ')
+		/([-+]?)(\d{2,14})
+		  (?:
+		    \s*
+		    t?
+		    \s*
+		    (\d{2,6})?(?:[,.](\d*))?
+		  )?
+		  (?:
+		    \s*
+		    (
+		      z\b
+		    |
+		      [-+]\d{1,4}\b
+		    |
+		      \[[-+]?\d[^\]]*\]
+		    )
+		  )?
+		/ix,
+		' ')
       case $2.size
       when 2
-        if $3.nil? && $4
-          e.sec = $2[-2, 2].to_i
-        else
-          e.mday = $2[ 0, 2].to_i
-        end
+	if $3.nil? && $4
+	  e.sec  = $2[-2, 2].to_i
+	else
+	  e.mday = $2[ 0, 2].to_i
+	end
       when 4
-        if $3.nil? && $4
-          e.sec = $2[-2, 2].to_i
-          e.min = $2[-4, 2].to_i
-        else
-          e.mon = $2[ 0, 2].to_i
-          e.mday = $2[ 2, 2].to_i
-        end
+	if $3.nil? && $4
+	  e.sec  = $2[-2, 2].to_i
+	  e.min  = $2[-4, 2].to_i
+	else
+	  e.mon  = $2[ 0, 2].to_i
+	  e.mday = $2[ 2, 2].to_i
+	end
       when 6
-        if $3.nil? && $4
-          e.sec = $2[-2, 2].to_i
-          e.min = $2[-4, 2].to_i
-          e.hour = $2[-6, 2].to_i
-        else
-          e.year = ($1 + $2[ 0, 2]).to_i
-          e.mon = $2[ 2, 2].to_i
-          e.mday = $2[ 4, 2].to_i
-        end
+	if $3.nil? && $4
+	  e.sec  = $2[-2, 2].to_i
+	  e.min  = $2[-4, 2].to_i
+	  e.hour = $2[-6, 2].to_i
+	else
+	  e.year = ($1 + $2[ 0, 2]).to_i
+	  e.mon  = $2[ 2, 2].to_i
+	  e.mday = $2[ 4, 2].to_i
+	end
       when 8, 10, 12, 14
-        if $3.nil? && $4
-          e.sec = $2[-2, 2].to_i
-          e.min = $2[-4, 2].to_i
-          e.hour = $2[-6, 2].to_i
-          e.mday = $2[-8, 2].to_i
-          if $2.size >= 10
-            e.mon = $2[-10, 2].to_i
-          end
-          if $2.size == 12
-            e.year = ($1 + $2[-12, 2]).to_i
-          end
-          if $2.size == 14
-            e.year = ($1 + $2[-14, 4]).to_i
-            e._comp = false
-          end
-        else
-          e.year = ($1 + $2[ 0, 4]).to_i
-          e.mon = $2[ 4, 2].to_i
-          e.mday = $2[ 6, 2].to_i
-          e.hour = $2[ 8, 2].to_i if $2.size >= 10
-          e.min = $2[10, 2].to_i if $2.size >= 12
-          e.sec = $2[12, 2].to_i if $2.size >= 14
-          e._comp = false
-        end
+	if $3.nil? && $4
+	  e.sec  = $2[-2, 2].to_i
+	  e.min  = $2[-4, 2].to_i
+	  e.hour = $2[-6, 2].to_i
+	  e.mday = $2[-8, 2].to_i
+	  if $2.size >= 10
+	    e.mon  = $2[-10, 2].to_i
+	  end
+	  if $2.size == 12
+	    e.year = ($1 + $2[-12, 2]).to_i
+	  end
+	  if $2.size == 14
+	    e.year = ($1 + $2[-14, 4]).to_i
+	    e._comp = false
+	  end
+	else
+	  e.year = ($1 + $2[ 0, 4]).to_i
+	  e.mon  = $2[ 4, 2].to_i
+	  e.mday = $2[ 6, 2].to_i
+	  e.hour = $2[ 8, 2].to_i if $2.size >= 10
+	  e.min  = $2[10, 2].to_i if $2.size >= 12
+	  e.sec  = $2[12, 2].to_i if $2.size >= 14
+	  e._comp = false
+	end
       when 3
-        if $3.nil? && $4
-          e.sec = $2[-2, 2].to_i
-          e.min = $2[-3, 1].to_i
-        else
-          e[:yday] = $2[ 0, 3].to_i
-        end
+	if $3.nil? && $4
+	  e.sec  = $2[-2, 2].to_i
+	  e.min  = $2[-3, 1].to_i
+	else
+	  e[:yday] = $2[ 0, 3].to_i
+	end
       when 5
-        if $3.nil? && $4
-          e.sec = $2[-2, 2].to_i
-          e.min = $2[-4, 2].to_i
-          e.hour = $2[-5, 1].to_i
-        else
-          e.year = ($1 + $2[ 0, 2]).to_i
-          e[:yday] = $2[ 2, 3].to_i
-        end
+	if $3.nil? && $4
+	  e.sec  = $2[-2, 2].to_i
+	  e.min  = $2[-4, 2].to_i
+	  e.hour = $2[-5, 1].to_i
+	else
+	  e.year = ($1 + $2[ 0, 2]).to_i
+	  e[:yday] = $2[ 2, 3].to_i
+	end
       when 7
-        if $3.nil? && $4
-          e.sec = $2[-2, 2].to_i
-          e.min = $2[-4, 2].to_i
-          e.hour = $2[-6, 2].to_i
-          e.mday = $2[-7, 1].to_i
-        else
-          e.year = ($1 + $2[ 0, 4]).to_i
-          e[:yday] = $2[ 4, 3].to_i
-        end
+	if $3.nil? && $4
+	  e.sec  = $2[-2, 2].to_i
+	  e.min  = $2[-4, 2].to_i
+	  e.hour = $2[-6, 2].to_i
+	  e.mday = $2[-7, 1].to_i
+	else
+	  e.year = ($1 + $2[ 0, 4]).to_i
+	  e[:yday] = $2[ 4, 3].to_i
+	end
       end
       if $3
-        if $4
-          case $3.size
-          when 2, 4, 6
-            e.sec = $3[-2, 2].to_i
-            e.min = $3[-4, 2].to_i if $3.size >= 4
-            e.hour = $3[-6, 2].to_i if $3.size >= 6
-          end
-        else
-          case $3.size
-          when 2, 4, 6
-            e.hour = $3[ 0, 2].to_i
-            e.min = $3[ 2, 2].to_i if $3.size >= 4
-            e.sec = $3[ 4, 2].to_i if $3.size >= 6
-          end
-        end
+	if $4
+	  case $3.size
+	  when 2, 4, 6
+	    e.sec  = $3[-2, 2].to_i
+	    e.min  = $3[-4, 2].to_i if $3.size >= 4
+	    e.hour = $3[-6, 2].to_i if $3.size >= 6
+	  end
+	else
+	  case $3.size
+	  when 2, 4, 6
+	    e.hour = $3[ 0, 2].to_i
+	    e.min  = $3[ 2, 2].to_i if $3.size >= 4
+	    e.sec  = $3[ 4, 2].to_i if $3.size >= 6
+	  end
+	end
       end
       if $4
-        e.sec_fraction = Rational($4.to_i, 10**$4.size)
+	e.sec_fraction = Rational($4.to_i, 10**$4.size)
       end
       if $5
-        e.zone = $5
-        if e.zone[0,1] == '['
-          o, n, = e.zone[1..-2].split(':')
-          e.zone = n || o
-          if /\A\d/ =~ o
-            o = format('+%s', o)
-          end
-          e.offset = zone_to_diff(o)
-        end
+	e.zone = $5
+	if e.zone[0,1] == '['
+	  o, n, = e.zone[1..-2].split(':')
+	  e.zone = n || o
+	  if /\A\d/ =~ o
+	    o = format('+%s', o)
+	  end
+	  e.offset = zone_to_diff(o)
+	end
       end
       true
     end
   end
 
   private_class_method :_parse_day, :_parse_time, # :_parse_beat,
-        :_parse_eu, :_parse_us, :_parse_iso, :_parse_iso2,
-        :_parse_jis, :_parse_vms, :_parse_sla, :_parse_dot,
-        :_parse_year, :_parse_mon, :_parse_mday, :_parse_ddd
+	:_parse_eu, :_parse_us, :_parse_iso, :_parse_iso2,
+	:_parse_jis, :_parse_vms, :_parse_sla, :_parse_dot,
+	:_parse_year, :_parse_mon, :_parse_mday, :_parse_ddd
 
-  def self._parse(str, comp=false, return_bag=false)
+  def self._parse(str, comp=true)
     str = str.dup
 
     e = Format::Bag.new
 
     e._comp = comp
 
-    str.gsub!(/[^-+',.\/:@[:alnum:]\[\]\x80-\xff]+/n, ' ')
+    str.gsub!(/[^-+',.\/:@[:alnum:]\[\]]+/, ' ')
 
     _parse_time(str, e) # || _parse_beat(str, e)
     _parse_day(str, e)
@@ -1092,82 +1067,228 @@ class Date
     _parse_mday(str, e)   ||
     _parse_ddd(str, e)
 
-    if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/in, ' ')
+    if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/i, ' ')
       if e.year
-        e.year = -e.year + 1
+	e.year = -e.year + 1
       end
     end
 
-    if str.sub!(/\A\s*(\d{1,2})\s*\z/n, ' ')
+    if str.sub!(/\A\s*(\d{1,2})\s*\z/, ' ')
       if e.hour && !e.mday
-        v = $1.to_i
-        if (1..31) === v
-          e.mday = v
-        end
+	v = $1.to_i
+	if (1..31) === v
+	  e.mday = v
+	end
       end
       if e.mday && !e.hour
-        v = $1.to_i
-        if (0..24) === v
-          e.hour = v
-        end
+	v = $1.to_i
+	if (0..24) === v
+	  e.hour = v
+	end
       end
     end
 
     if e._comp
       if e[:cwyear]
-        if e[:cwyear] >= 0 && e[:cwyear] <= 99
-          e[:cwyear] += if e[:cwyear] >= 69
-        	      then 1900 else 2000 end
-        end
+	if e[:cwyear] >= 0 && e[:cwyear] <= 99
+	  e[:cwyear] += if e[:cwyear] >= 69
+		      then 1900 else 2000 end
+	end
       end
       if e.year
-        if e.year >= 0 && e.year <= 99
-          e.year += if e.year >= 69
-        	    then 1900 else 2000 end
-        end
+	if e.year >= 0 && e.year <= 99
+	  e.year += if e.year >= 69
+		    then 1900 else 2000 end
+	end
       end
     end
 
     e.offset ||= zone_to_diff(e.zone) if e.zone
 
-    return e if return_bag
     e.to_hash
   end
 
-  def self.zone_to_diff(zone) # :nodoc:
-    zone = zone.downcase
-    if zone.sub!(/\s+(standard|daylight)\s+time\z/, '')
-      dst = $1 == 'daylight'
+  def self._iso8601(str) # :nodoc:
+    if /\A\s*(([-+]?\d{2,}|-)-\d{2}-\d{2}|
+	      ([-+]?\d{2,})?-\d{3}|
+	      (\d{2}|\d{4})?-w\d{2}-\d|
+	      -w-\d)
+	(t
+	\d{2}:\d{2}(:\d{2}([,.]\d+)?)?
+	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/ix =~ str
+      _parse(str)
+    elsif /\A\s*(([-+]?(\d{2}|\d{4})|--)\d{2}\d{2}|
+	      ([-+]?(\d{2}|\d{4}))?\d{3}|-\d{3}|
+	      (\d{2}|\d{4})?w\d{2}\d)
+	(t?
+	\d{2}\d{2}(\d{2}([,.]\d+)?)?
+	(z|[-+]\d{2}(\d{2})?)?)?\s*\z/ix =~ str
+      _parse(str)
+    elsif /\A\s*(\d{2}:\d{2}(:\d{2}([,.]\d+)?)?
+	(z|[-+]\d{2}(:?\d{2})?)?)?\s*\z/ix =~ str
+      _parse(str)
+    elsif /\A\s*(\d{2}\d{2}(\d{2}([,.]\d+)?)?
+	(z|[-+]\d{2}(\d{2})?)?)?\s*\z/ix =~ str
+      _parse(str)
+    end
+  end
+
+  def self._rfc3339(str) # :nodoc:
+    if /\A\s*-?\d{4}-\d{2}-\d{2} # allow minus, anyway
+	(t|\s)
+	\d{2}:\d{2}:\d{2}(\.\d+)?
+	(z|[-+]\d{2}:\d{2})\s*\z/ix =~ str
+      _parse(str)
+    end
+  end
+
+  def self._xmlschema(str) # :nodoc:
+    if /\A\s*(-?\d{4,})(?:-(\d{2})(?:-(\d{2}))?)?
+	(?:t
+	  (\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?)?
+	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
+      e = Format::Bag.new
+      e.year = $1.to_i
+      e.mon = $2.to_i if $2
+      e.mday = $3.to_i if $3
+      e.hour = $4.to_i if $4
+      e.min = $5.to_i if $5
+      e.sec = $6.to_i if $6
+      e.sec_fraction = Rational($7.to_i, 10**$7.size) if $7
+      if $8
+	e.zone = $8
+	e.offset = zone_to_diff($8)
+      end
+      e.to_hash
+    elsif /\A\s*(\d{2}):(\d{2}):(\d{2})(?:\.(\d+))?
+	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
+      e = Format::Bag.new
+      e.hour = $1.to_i if $1
+      e.min = $2.to_i if $2
+      e.sec = $3.to_i if $3
+      e.sec_fraction = Rational($4.to_i, 10**$4.size) if $4
+      if $5
+	e.zone = $5
+	e.offset = zone_to_diff($5)
+      end
+      e.to_hash
+    elsif /\A\s*(?:--(\d{2})(?:-(\d{2}))?|---(\d{2}))
+	(z|[-+]\d{2}:\d{2})?\s*\z/ix =~ str
+      e = Format::Bag.new
+      e.mon = $1.to_i if $1
+      e.mday = $2.to_i if $2
+      e.mday = $3.to_i if $3
+      if $4
+	e.zone = $4
+	e.offset = zone_to_diff($4)
+      end
+      e.to_hash
+    end
+  end
+
+  def self._rfc2822(str) # :nodoc:
+    if /\A\s*(?:(?:#{Format::ABBR_DAYS.keys.join('|')})\s*,\s+)?
+	\d{1,2}\s+
+	(?:#{Format::ABBR_MONTHS.keys.join('|')})\s+
+	-?(\d{2,})\s+ # allow minus, anyway
+	\d{2}:\d{2}(:\d{2})?\s*
+	(?:[-+]\d{4}|ut|gmt|e[sd]t|c[sd]t|m[sd]t|p[sd]t|[a-ik-z])\s*\z/iox =~ str
+      e = _parse(str, false)
+      if $1.size < 4
+	if e[:year] < 50
+	  e[:year] += 2000
+	elsif e[:year] < 1000
+	  e[:year] += 1900
+	end
+      end
+      e
+    end
+  end
+
+  class << self; alias_method :_rfc822, :_rfc2822 end
+
+  def self._httpdate(str) # :nodoc:
+    if /\A\s*(#{Format::ABBR_DAYS.keys.join('|')})\s*,\s+
+	\d{2}\s+
+	(#{Format::ABBR_MONTHS.keys.join('|')})\s+
+	-?\d{4}\s+ # allow minus, anyway
+	\d{2}:\d{2}:\d{2}\s+
+	gmt\s*\z/iox =~ str
+      _rfc2822(str)
+    elsif /\A\s*(#{Format::DAYS.keys.join('|')})\s*,\s+
+	\d{2}\s*-\s*
+	(#{Format::ABBR_MONTHS.keys.join('|')})\s*-\s*
+	\d{2}\s+
+	\d{2}:\d{2}:\d{2}\s+
+	gmt\s*\z/iox =~ str
+      _parse(str)
+    elsif /\A\s*(#{Format::ABBR_DAYS.keys.join('|')})\s+
+	(#{Format::ABBR_MONTHS.keys.join('|')})\s+
+	\d{1,2}\s+
+	\d{2}:\d{2}:\d{2}\s+
+	\d{4}\s*\z/iox =~ str
+      _parse(str)
+    end
+  end
+
+  def self._jisx0301(str) # :nodoc:
+    if /\A\s*[mtsh]?\d{2}\.\d{2}\.\d{2}
+	(t
+	(\d{2}:\d{2}(:\d{2}([,.]\d*)?)?
+	(z|[-+]\d{2}(:?\d{2})?)?)?)?\s*\z/ix =~ str
+      if /\A\s*\d/ =~ str
+	_parse(str.sub(/\A\s*(\d)/, 'h\1'))
+      else
+	_parse(str)
+      end
     else
-      dst = zone.sub!(/\s+dst\z/, '')
+      _iso8601(str)
     end
-    if Format::ZONES.include?(zone)
-      offset = Format::ZONES[zone]
-      offset += 3600 if dst
-    elsif zone.sub!(/\A(?:gmt|utc?)?([-+])/, '')
-      sign = $1
-      if zone.include?(':')
-        hour, min, sec, = zone.split(':')
-      elsif zone.include?(',') || zone.include?('.')
-        hour, fr, = zone.split(/[,.]/)
-        min = Rational(fr.to_i, 10**fr.size) * 60
+  end
+
+  t = Module.new do
+
+    private
+
+    def zone_to_diff(zone) # :nodoc:
+      zone = zone.downcase
+      if zone.sub!(/\s+(standard|daylight)\s+time\z/, '')
+	dst = $1 == 'daylight'
       else
-        case zone.size
-        when 3
-          hour = zone[0,1]
-          min = zone[1,2]
-        else
-          hour = zone[0,2]
-          min = zone[2,2]
-          sec = zone[4,2]
-        end
+	dst = zone.sub!(/\s+dst\z/, '')
+      end
+      if Format::ZONES.include?(zone)
+	offset = Format::ZONES[zone]
+	offset += 3600 if dst
+      elsif zone.sub!(/\A(?:gmt|utc?)?([-+])/, '')
+	sign = $1
+	if zone.include?(':')
+	  hour, min, sec, = zone.split(':')
+	elsif zone.include?(',') || zone.include?('.')
+	  hour, fr, = zone.split(/[,.]/)
+	  min = Rational(fr.to_i, 10**fr.size) * 60
+	else
+	  case zone.size
+	  when 3
+	    hour = zone[0,1]
+	    min = zone[1,2]
+	  else
+	    hour = zone[0,2]
+	    min = zone[2,2]
+	    sec = zone[4,2]
+	  end
+	end
+	offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
+	offset *= -1 if sign == '-'
       end
-      offset = hour.to_i * 3600 + min.to_i * 60 + sec.to_i
-      offset *= -1 if sign == '-'
+      offset
     end
-    offset
+
   end
 
+  extend  t
+  include t
+
 end
 
 class DateTime < Date
@@ -1180,15 +1301,14 @@ class DateTime < Date
     super(str, fmt)
   end
 
-=begin
   def iso8601_timediv(n) # :nodoc:
     strftime('T%T' +
-             if n < 1
-               ''
-             else
-               '.%0*d' % [n, (sec_fraction / SECONDS_IN_DAY / (10**n)).round]
-             end +
-             '%:z')
+	     if n < 1
+	       ''
+	     else
+	       '.%0*d' % [n, (sec_fraction / Rational(1, 10**n)).round]
+	     end +
+	     '%:z')
   end
 
   private :iso8601_timediv
@@ -1199,9 +1319,10 @@ class DateTime < Date
 
   def rfc3339(n=0) iso8601(n) end
 
+  def xmlschema(n=0) iso8601(n) end # :nodoc:
+
   def jisx0301(n=0)
     super() + iso8601_timediv(n)
   end
-=end
 
 end