edtf 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87a0f22cbe9f6c23a2a866e4b0ca189b2004032ab696838a5f654e8291d31c14
-  data.tar.gz: 82248eca4a7355b0c909794d80b14cee7588e48f2f3159ad0969c9f04813107d
+  metadata.gz: 6ae495726f6cf31d59abe7287cf15cc0f1f9c4351b39cb1f0ace76f568db116c
+  data.tar.gz: 64c86e16af98822eb03d043665f0f78c94afe0136d30c565026d165888b66058
 SHA512:
-  metadata.gz: 36c62ad45ff45792ee3ec9fd5c45a7763476098bca5105577c65c16576f2f913641e016f1d9b01043bdf8ef9a1a5f68a52e438be9378e8b3c33eb0bf89bd9387
-  data.tar.gz: dc3cefb8eb0033c9fd238fe08cbeebea902e27554c8d4cccdddcc188c1ac9cd73f3d76145c9a4fa721416e33a19ddb780167f11c966acbb54047be1f0b736a5b
+  metadata.gz: 363365cb65e9e8c0bb27d067ad16ebd3878f711662bebc89d64dc59be0f22cb96ce878730fce0f28a7a444b468f9547c296ed4ff739a2878edb2c63dbedbc0ba
+  data.tar.gz: aa3647e4949f4da126069e955104208b99da67688d822fa2b6f20943919cbbeaca4adb84b76ed95f7bd6b9fc8db1fc5d088a24d0de2ea1528e9653d904acdf82

data/lib/edtf/epoch.rb

@@ -61,9 +61,9 @@ module EDTF
       false
     end
 
-    def each
+    def each(&block)
       if block_given?
-        to_range.each(&Proc.new)
+        to_range.each(&block)
       else
         to_enum
       end

data/lib/edtf/parser.rb

@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.14
-# from Racc grammer file "".
+# This file is automatically generated by Racc 1.5.0
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
@@ -11,7 +11,7 @@ require 'strscan'
 module EDTF
   class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 447)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 453)
 
   @defaults = {
     :level => 2,
@@ -355,39 +355,39 @@ racc_action_pointer = [
    388,   nil,   nil,   384,   nil,   nil,   nil ]
 
 racc_action_default = [
-  -179,  -179,    -1,    -2,    -3,    -4,    -5,    -6,    -7,    -8,
-   -23,  -179,  -179,   -33,   -34,   -35,   -36,   -37,  -179,   -39,
-   -40,   -41,   -42,   -43,  -179,   -52,   -54,   -55,  -179,   -67,
-   -70,   -71,   -72,   -73,   -74,  -179,  -179,  -110,  -179,  -112,
-  -113,  -114,  -131,  -132,  -133,  -134,  -135,  -136,  -137,  -138,
-  -139,  -140,  -141,  -179,  -179,   -79,  -179,  -115,  -179,  -179,
-  -179,   -24,  -179,   -44,  -179,  -179,   -75,  -179,  -179,  -179,
-   -58,  -179,  -173,  -179,    -6,    -7,    -8,   -39,  -179,   -84,
-   -89,   -90,   -91,   -93,   -94,   -95,   -96,   -97,  -179,  -179,
-  -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,  -179,   327,
-    -9,   -10,  -179,   -13,  -179,   -30,  -179,  -179,  -155,   -26,
-   -28,  -179,  -129,  -179,  -179,  -179,  -179,   -27,   -29,  -179,
-  -179,  -179,  -156,  -163,  -179,  -165,  -179,  -179,  -179,  -179,
-  -179,   -76,  -177,  -179,  -179,  -179,    -6,   -50,   -51,   -52,
-   -53,   -54,   -56,   -57,   -61,   -59,  -179,  -174,  -179,  -179,
-  -101,  -100,   -99,   -82,  -179,  -179,    -6,    -7,   -98,   -83,
-  -179,  -179,  -179,  -179,  -129,  -179,  -129,  -179,   -11,   -15,
-  -179,  -179,  -179,  -179,  -150,  -151,  -152,  -153,  -148,  -154,
-  -149,  -117,   -47,   -62,  -130,   -63,   -64,   -65,   -66,  -142,
-  -143,  -144,  -145,  -179,  -179,  -179,  -123,   -48,  -157,  -158,
-  -159,  -160,  -161,  -162,  -164,  -166,  -179,  -179,   -25,   -45,
-   -80,   -46,   -81,  -178,   -38,  -179,  -179,  -179,  -179,  -175,
-   -77,  -179,  -104,  -179,  -103,  -179,  -102,   -86,   -87,   -88,
-   -92,  -179,  -179,  -179,  -111,  -179,  -116,  -179,  -179,  -179,
-  -120,  -179,   -16,  -179,  -179,  -179,  -146,   -17,   -18,  -179,
-  -179,   -31,  -179,  -167,  -179,  -179,  -179,  -172,  -179,  -179,
-  -118,  -179,  -179,  -124,  -105,  -179,  -179,   -78,  -176,   -47,
-  -179,   -28,   -29,  -119,  -179,  -179,  -121,  -179,  -179,  -147,
-  -179,  -179,  -179,  -171,  -168,  -169,  -170,  -179,  -179,  -109,
-  -129,  -179,  -179,  -108,  -106,  -179,   -60,  -179,   -85,  -179,
-  -179,   -20,  -179,  -179,  -179,   -12,   -32,  -179,   -49,  -122,
-  -125,  -179,  -107,  -127,  -179,  -179,   -22,  -179,  -179,  -179,
-  -179,   -21,   -19,  -179,  -126,  -128,   -14 ]
+  -180,  -180,    -1,    -2,    -3,    -4,    -5,    -6,    -7,    -8,
+   -23,  -180,  -180,   -33,   -34,   -35,   -36,   -37,  -180,   -39,
+   -40,   -41,   -42,   -43,  -180,   -52,   -54,   -55,  -180,   -67,
+   -70,   -71,   -72,   -73,   -74,  -180,  -180,  -111,  -180,  -113,
+  -114,  -115,  -132,  -133,  -134,  -135,  -136,  -137,  -138,  -139,
+  -140,  -141,  -142,  -180,  -180,   -79,  -180,  -116,  -180,  -180,
+  -180,   -24,  -180,   -44,  -180,  -180,   -75,  -180,  -180,  -180,
+   -58,  -180,  -174,  -180,    -6,    -7,    -8,   -39,  -180,   -84,
+   -89,   -90,   -91,   -93,   -94,   -95,   -96,   -97,  -180,  -180,
+  -180,  -180,  -180,  -180,  -180,  -180,  -180,  -180,  -180,   327,
+    -9,   -10,  -180,   -13,  -180,   -30,  -180,  -180,  -156,   -26,
+   -28,  -180,  -130,  -180,  -180,  -180,  -180,   -27,   -29,  -180,
+  -180,  -180,  -157,  -164,  -180,  -166,  -180,  -180,  -180,  -180,
+  -180,   -76,  -178,  -180,  -106,  -180,    -6,   -50,   -51,   -52,
+   -53,   -54,   -56,   -57,   -61,   -59,  -180,  -175,  -180,  -180,
+  -101,  -100,   -99,   -82,  -180,  -180,    -6,    -7,   -98,   -83,
+  -180,  -180,  -180,  -180,  -130,  -180,  -130,  -180,   -11,   -15,
+  -180,  -180,  -180,  -180,  -151,  -152,  -153,  -154,  -149,  -155,
+  -150,  -118,   -47,   -62,  -131,   -63,   -64,   -65,   -66,  -143,
+  -144,  -145,  -146,  -180,  -180,  -180,  -124,   -48,  -158,  -159,
+  -160,  -161,  -162,  -163,  -165,  -167,  -180,  -180,   -25,   -45,
+   -80,   -46,   -81,  -179,   -38,  -180,  -180,  -180,  -180,  -176,
+   -77,  -180,  -104,  -180,  -103,  -180,  -102,   -86,   -87,   -88,
+   -92,  -180,  -180,  -180,  -112,  -180,  -117,  -180,  -180,  -180,
+  -121,  -180,   -16,  -180,  -180,  -180,  -147,   -17,   -18,  -180,
+  -180,   -31,  -180,  -168,  -180,  -180,  -180,  -173,  -180,  -180,
+  -119,  -180,  -180,  -125,  -105,  -180,  -180,   -78,  -177,   -47,
+  -180,   -28,   -29,  -120,  -180,  -180,  -122,  -180,  -180,  -148,
+  -180,  -180,  -180,  -172,  -169,  -170,  -171,  -180,  -180,  -110,
+  -130,  -180,  -180,  -109,  -107,  -180,   -60,  -180,   -85,  -180,
+  -180,   -20,  -180,  -180,  -180,   -12,   -32,  -180,   -49,  -123,
+  -126,  -180,  -108,  -128,  -180,  -180,   -22,  -180,  -180,  -180,
+  -180,   -21,   -19,  -180,  -127,  -129,   -14 ]
 
 racc_goto_table = [
     72,   118,   126,    12,   183,   131,   230,   253,     8,   250,
@@ -576,32 +576,33 @@ racc_reduce_table = [
   3, 98, :_reduce_103,
   3, 98, :_reduce_104,
   5, 79, :_reduce_105,
-  6, 79, :_reduce_106,
-  7, 79, :_reduce_107,
-  6, 79, :_reduce_108,
+  3, 79, :_reduce_106,
+  6, 79, :_reduce_107,
+  7, 79, :_reduce_108,
   6, 79, :_reduce_109,
+  6, 79, :_reduce_110,
   1, 78, :_reduce_none,
-  4, 78, :_reduce_111,
-  1, 99, :_reduce_112,
+  4, 78, :_reduce_112,
   1, 99, :_reduce_113,
   1, 99, :_reduce_114,
-  2, 100, :_reduce_115,
-  4, 101, :_reduce_116,
+  1, 99, :_reduce_115,
+  2, 100, :_reduce_116,
   4, 101, :_reduce_117,
-  5, 101, :_reduce_118,
+  4, 101, :_reduce_118,
   5, 101, :_reduce_119,
-  4, 102, :_reduce_120,
-  5, 102, :_reduce_121,
-  7, 102, :_reduce_122,
-  4, 102, :_reduce_123,
-  5, 102, :_reduce_124,
-  7, 102, :_reduce_125,
-  9, 102, :_reduce_126,
-  7, 102, :_reduce_127,
-  9, 102, :_reduce_128,
-  0, 83, :_reduce_129,
+  5, 101, :_reduce_120,
+  4, 102, :_reduce_121,
+  5, 102, :_reduce_122,
+  7, 102, :_reduce_123,
+  4, 102, :_reduce_124,
+  5, 102, :_reduce_125,
+  7, 102, :_reduce_126,
+  9, 102, :_reduce_127,
+  7, 102, :_reduce_128,
+  9, 102, :_reduce_129,
+  0, 83, :_reduce_130,
   1, 83, :_reduce_none,
-  1, 59, :_reduce_131,
+  1, 59, :_reduce_132,
   1, 59, :_reduce_none,
   1, 81, :_reduce_none,
   1, 81, :_reduce_none,
@@ -612,45 +613,45 @@ racc_reduce_table = [
   1, 81, :_reduce_none,
   1, 81, :_reduce_none,
   1, 81, :_reduce_none,
-  2, 61, :_reduce_142,
   2, 61, :_reduce_143,
   2, 61, :_reduce_144,
   2, 61, :_reduce_145,
+  2, 61, :_reduce_146,
   1, 56, :_reduce_none,
-  2, 56, :_reduce_147,
-  2, 103, :_reduce_148,
+  2, 56, :_reduce_148,
   2, 103, :_reduce_149,
   2, 103, :_reduce_150,
   2, 103, :_reduce_151,
   2, 103, :_reduce_152,
   2, 103, :_reduce_153,
+  2, 103, :_reduce_154,
   2, 64, :_reduce_none,
   1, 64, :_reduce_none,
   1, 104, :_reduce_none,
-  2, 104, :_reduce_157,
   2, 104, :_reduce_158,
   2, 104, :_reduce_159,
   2, 104, :_reduce_160,
   2, 104, :_reduce_161,
   2, 104, :_reduce_162,
+  2, 104, :_reduce_163,
   1, 105, :_reduce_none,
-  2, 105, :_reduce_164,
+  2, 105, :_reduce_165,
   1, 63, :_reduce_none,
-  2, 63, :_reduce_166,
+  2, 63, :_reduce_167,
   1, 57, :_reduce_none,
-  2, 57, :_reduce_168,
   2, 57, :_reduce_169,
   2, 57, :_reduce_170,
+  2, 57, :_reduce_171,
   2, 65, :_reduce_none,
   1, 65, :_reduce_none,
-  1, 91, :_reduce_173,
-  2, 91, :_reduce_174,
-  3, 91, :_reduce_175,
-  4, 91, :_reduce_176,
-  1, 90, :_reduce_177,
-  2, 90, :_reduce_178 ]
+  1, 91, :_reduce_174,
+  2, 91, :_reduce_175,
+  3, 91, :_reduce_176,
+  4, 91, :_reduce_177,
+  1, 90, :_reduce_178,
+  2, 90, :_reduce_179 ]
 
-racc_reduce_n = 179
+racc_reduce_n = 180
 
 racc_shift_n = 327
 
@@ -839,21 +840,21 @@ Racc_debug_parser = false
 
 module_eval(<<'.,.,', 'parser.y', 23)
   def _reduce_6(val, _values, result)
-     result = Date.new(val[0]).year_precision! 
+     result = Date.new(val[0]).year_precision!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 24)
   def _reduce_7(val, _values, result)
-     result = Date.new(*val.flatten).month_precision! 
+     result = Date.new(*val.flatten).month_precision!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 25)
   def _reduce_8(val, _values, result)
-     result = Date.new(*val.flatten).day_precision! 
+     result = Date.new(*val.flatten).day_precision!
     result
   end
 .,.,
@@ -862,7 +863,7 @@ module_eval(<<'.,.,', 'parser.y', 30)
   def _reduce_9(val, _values, result)
         result = DateTime.new(val[0].year, val[0].month, val[0].day, *val[2])
     result.skip_timezone = (val[2].length == 3)
-  
+
     result
   end
 .,.,
@@ -871,14 +872,14 @@ module_eval(<<'.,.,', 'parser.y', 30)
 
 module_eval(<<'.,.,', 'parser.y', 35)
   def _reduce_11(val, _values, result)
-     result = val.flatten 
+     result = val.flatten
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 37)
   def _reduce_12(val, _values, result)
-     result = val.values_at(0, 2, 4) 
+     result = val.values_at(0, 2, 4)
     result
   end
 .,.,
@@ -887,28 +888,28 @@ module_eval(<<'.,.,', 'parser.y', 37)
 
 module_eval(<<'.,.,', 'parser.y', 40)
   def _reduce_14(val, _values, result)
-     result = [24, 0, 0] 
+     result = [24, 0, 0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 42)
   def _reduce_15(val, _values, result)
-     result = 0 
+     result = 0
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 43)
   def _reduce_16(val, _values, result)
-     result = -1 * val[1] 
+     result = -1 * val[1]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 44)
   def _reduce_17(val, _values, result)
-     result = val[1] 
+     result = val[1]
     result
   end
 .,.,
@@ -917,28 +918,28 @@ module_eval(<<'.,.,', 'parser.y', 44)
 
 module_eval(<<'.,.,', 'parser.y', 48)
   def _reduce_19(val, _values, result)
-     result = 0 
+     result = 0
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 52)
   def _reduce_20(val, _values, result)
-     result = Rational(val[0] * 60 + val[2], 1440) 
+     result = Rational(val[0] * 60 + val[2], 1440)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 53)
   def _reduce_21(val, _values, result)
-     result = Rational(840, 1440) 
+     result = Rational(840, 1440)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 54)
   def _reduce_22(val, _values, result)
-     result = Rational(val[3], 1440) 
+     result = Rational(val[3], 1440)
     result
   end
 .,.,
@@ -947,7 +948,7 @@ module_eval(<<'.,.,', 'parser.y', 54)
 
 module_eval(<<'.,.,', 'parser.y', 58)
   def _reduce_24(val, _values, result)
-     result = -val[1] 
+     result = -val[1]
     result
   end
 .,.,
@@ -955,7 +956,7 @@ module_eval(<<'.,.,', 'parser.y', 58)
 module_eval(<<'.,.,', 'parser.y', 61)
   def _reduce_25(val, _values, result)
         result = val.zip([1000,100,10,1]).reduce(0) { |s,(a,b)| s += a * b }
-  
+
     result
   end
 .,.,
@@ -966,7 +967,7 @@ module_eval(<<'.,.,', 'parser.y', 61)
 
 module_eval(<<'.,.,', 'parser.y', 67)
   def _reduce_28(val, _values, result)
-     result = [val[0], val[2]] 
+     result = [val[0], val[2]]
     result
   end
 .,.,
@@ -977,7 +978,7 @@ module_eval(<<'.,.,', 'parser.y', 74)
     if result[2] > 31 || (result[2] > 30 && [2,4,6,9,11].include?(result[1])) || (result[2] > 29 && result[1] == 2)
       raise ArgumentError, "invalid date (invalid days #{result[2]} for month #{result[1]})"
     end
-  
+
     result
   end
 .,.,
@@ -1000,7 +1001,7 @@ module_eval(<<'.,.,', 'parser.y', 74)
 
 module_eval(<<'.,.,', 'parser.y', 93)
   def _reduce_38(val, _values, result)
-     result = EDTF::Unknown.new 
+     result = EDTF::Unknown.new
     result
   end
 .,.,
@@ -1009,7 +1010,7 @@ module_eval(<<'.,.,', 'parser.y', 99)
   def _reduce_39(val, _values, result)
                     result = Date.new(val[0][0]).year_precision!
                 result.unspecified.year[2,2] = val[0][1]
-              
+
     result
   end
 .,.,
@@ -1026,7 +1027,7 @@ module_eval(<<'.,.,', 'parser.y', 110)
   def _reduce_44(val, _values, result)
                          result = val[1]
                      result[0] = -result[0]
-                   
+
     result
   end
 .,.,
@@ -1034,7 +1035,7 @@ module_eval(<<'.,.,', 'parser.y', 110)
 module_eval(<<'.,.,', 'parser.y', 117)
   def _reduce_45(val, _values, result)
           result = [val[0,3].zip([1000,100,10]).reduce(0) { |s,(a,b)| s += a * b }, [false,true]]
-    
+
     result
   end
 .,.,
@@ -1042,7 +1043,7 @@ module_eval(<<'.,.,', 'parser.y', 117)
 module_eval(<<'.,.,', 'parser.y', 121)
   def _reduce_46(val, _values, result)
           result = [val[0,2].zip([1000,100]).reduce(0) { |s,(a,b)| s += a * b }, [true, true]]
-    
+
     result
   end
 .,.,
@@ -1051,7 +1052,7 @@ module_eval(<<'.,.,', 'parser.y', 125)
   def _reduce_47(val, _values, result)
         result = Date.new(val[0]).unspecified!(:month)
     result.precision = :month
-  
+
     result
   end
 .,.,
@@ -1059,7 +1060,7 @@ module_eval(<<'.,.,', 'parser.y', 125)
 module_eval(<<'.,.,', 'parser.y', 130)
   def _reduce_48(val, _values, result)
         result = Date.new(*val[0]).unspecified!(:day)
-  
+
     result
   end
 .,.,
@@ -1067,7 +1068,7 @@ module_eval(<<'.,.,', 'parser.y', 130)
 module_eval(<<'.,.,', 'parser.y', 134)
   def _reduce_49(val, _values, result)
         result = Date.new(val[0]).unspecified!([:day,:month])
-  
+
     result
   end
 .,.,
@@ -1075,7 +1076,7 @@ module_eval(<<'.,.,', 'parser.y', 134)
 module_eval(<<'.,.,', 'parser.y', 139)
   def _reduce_50(val, _values, result)
         result = Interval.new(val[0], val[2])
-  
+
     result
   end
 .,.,
@@ -1098,7 +1099,7 @@ module_eval(<<'.,.,', 'parser.y', 150)
   def _reduce_58(val, _values, result)
           result = Date.new(val[1])
       result.precision = :year
-    
+
     result
   end
 .,.,
@@ -1107,7 +1108,7 @@ module_eval(<<'.,.,', 'parser.y', 155)
   def _reduce_59(val, _values, result)
           result = Date.new(-1 * val[2])
       result.precision = :year
-    
+
     result
   end
 .,.,
@@ -1115,14 +1116,14 @@ module_eval(<<'.,.,', 'parser.y', 155)
 module_eval(<<'.,.,', 'parser.y', 162)
   def _reduce_60(val, _values, result)
           result = val.zip([10000,1000,100,10,1]).reduce(0) { |s,(a,b)| s += a * b }
-    
+
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 164)
   def _reduce_61(val, _values, result)
-     result = 10 * val[0] + val[1] 
+     result = 10 * val[0] + val[1]
     result
   end
 .,.,
@@ -1131,35 +1132,35 @@ module_eval(<<'.,.,', 'parser.y', 169)
   def _reduce_62(val, _values, result)
         result = Season.new(val[0], val[2])
     val[3].each { |ua| result.send(ua) }
-  
+
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 173)
   def _reduce_63(val, _values, result)
-     result = 21 
+     result = 21
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 174)
   def _reduce_64(val, _values, result)
-     result = 22 
+     result = 22
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 175)
   def _reduce_65(val, _values, result)
-     result = 23 
+     result = 23
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 176)
   def _reduce_66(val, _values, result)
-     result = 24 
+     result = 24
     result
   end
 .,.,
@@ -1182,7 +1183,7 @@ module_eval(<<'.,.,', 'parser.y', 176)
 
 module_eval(<<'.,.,', 'parser.y', 194)
   def _reduce_75(val, _values, result)
-     result = val[0]; result.qualifier = val[1] 
+     result = val[0]; result.qualifier = val[1]
     result
   end
 .,.,
@@ -1190,7 +1191,7 @@ module_eval(<<'.,.,', 'parser.y', 194)
 module_eval(<<'.,.,', 'parser.y', 200)
   def _reduce_76(val, _values, result)
           result = Date.new(val[0].year * 10 ** val[2]).year_precision!
-    
+
     result
   end
 .,.,
@@ -1198,7 +1199,7 @@ module_eval(<<'.,.,', 'parser.y', 200)
 module_eval(<<'.,.,', 'parser.y', 204)
   def _reduce_77(val, _values, result)
           result = Date.new(val[1] * 10 ** val[3]).year_precision!
-    
+
     result
   end
 .,.,
@@ -1206,14 +1207,14 @@ module_eval(<<'.,.,', 'parser.y', 204)
 module_eval(<<'.,.,', 'parser.y', 208)
   def _reduce_78(val, _values, result)
           result = Date.new(-1 * val[2] * 10 ** val[4]).year_precision!
-    
+
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 213)
   def _reduce_79(val, _values, result)
-     result = val[0]; result.calendar = val[1] 
+     result = val[0]; result.calendar = val[1]
     result
   end
 .,.,
@@ -1222,7 +1223,7 @@ module_eval(<<'.,.,', 'parser.y', 219)
   def _reduce_80(val, _values, result)
           d = val[0,3].zip([1000,100,10]).reduce(0) { |s,(a,b)| s += a * b }
       result = EDTF::Decade.new(d)
-    
+
     result
   end
 .,.,
@@ -1231,84 +1232,84 @@ module_eval(<<'.,.,', 'parser.y', 224)
   def _reduce_81(val, _values, result)
           d = val[0,2].zip([1000,100]).reduce(0) { |s,(a,b)| s += a * b }
       result = EDTF::Century.new(d)
-    
+
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 230)
   def _reduce_82(val, _values, result)
-     result = val[1].choice! 
+     result = val[1].choice!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 232)
   def _reduce_83(val, _values, result)
-     result = val[1] 
+     result = val[1]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 234)
   def _reduce_84(val, _values, result)
-     result = EDTF::Set.new(val[0]).earlier! 
+     result = EDTF::Set.new(val[0]).earlier!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 235)
   def _reduce_85(val, _values, result)
-     result = EDTF::Set.new([val[0]] + val[2] + [val[4]]).earlier!.later! 
+     result = EDTF::Set.new([val[0]] + val[2] + [val[4]]).earlier!.later!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 236)
   def _reduce_86(val, _values, result)
-     result = EDTF::Set.new([val[0]] + val[2]).earlier! 
+     result = EDTF::Set.new([val[0]] + val[2]).earlier!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 237)
   def _reduce_87(val, _values, result)
-     result = EDTF::Set.new([val[0]] + [val[2]]).earlier!.later! 
+     result = EDTF::Set.new([val[0]] + [val[2]]).earlier!.later!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 238)
   def _reduce_88(val, _values, result)
-     result = EDTF::Set.new(val[0] + [val[2]]).later! 
+     result = EDTF::Set.new(val[0] + [val[2]]).later!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 239)
   def _reduce_89(val, _values, result)
-     result = EDTF::Set.new(*val[0]) 
+     result = EDTF::Set.new(*val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 240)
   def _reduce_90(val, _values, result)
-     result = EDTF::Set.new(val[0]).later! 
+     result = EDTF::Set.new(val[0]).later!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 243)
   def _reduce_91(val, _values, result)
-     result = [val[0]].flatten 
+     result = [val[0]].flatten
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 244)
   def _reduce_92(val, _values, result)
-     result = val[0] + [val[2]].flatten 
+     result = val[0] + [val[2]].flatten
     result
   end
 .,.,
@@ -1325,49 +1326,49 @@ module_eval(<<'.,.,', 'parser.y', 244)
 
 module_eval(<<'.,.,', 'parser.y', 256)
   def _reduce_98(val, _values, result)
-     result = val[1] 
+     result = val[1]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 258)
   def _reduce_99(val, _values, result)
-     result = Date.new(*val[0]).day_precision! 
+     result = Date.new(*val[0]).day_precision!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 259)
   def _reduce_100(val, _values, result)
-     result = Date.new(*val[0]).month_precision! 
+     result = Date.new(*val[0]).month_precision!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 260)
   def _reduce_101(val, _values, result)
-     result = Date.new(val[0]).year_precision! 
+     result = Date.new(val[0]).year_precision!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 263)
   def _reduce_102(val, _values, result)
-     result = (Date.new(val[0]).day_precision! .. Date.new(val[2]).day_precision!) 
+     result = (Date.new(val[0]).day_precision! .. Date.new(val[2]).day_precision!)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 264)
   def _reduce_103(val, _values, result)
-     result = (Date.new(val[0]).month_precision! .. Date.new(val[2]).month_precision!) 
+     result = (Date.new(val[0]).month_precision! .. Date.new(val[2]).month_precision!)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 265)
   def _reduce_104(val, _values, result)
-     result = (Date.new(val[0]).year_precision! .. Date.new(val[2]).year_precision!) 
+     result = (Date.new(val[0]).year_precision! .. Date.new(val[2]).year_precision!)
     result
   end
 .,.,
@@ -1376,214 +1377,222 @@ module_eval(<<'.,.,', 'parser.y', 271)
   def _reduce_105(val, _values, result)
           result = Date.new(val[0][0], val[2], val[4])
       result.unspecified.year[2,2] = val[0][1]
-    
+
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 276)
   def _reduce_106(val, _values, result)
-          result = Date.new(val[0][0], 1, val[5])
+          result = Date.new(val[0][0], val[2], 1)
+      result.month_precision!
       result.unspecified.year[2,2] = val[0][1]
-      result.unspecified!(:month)
-    
+
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 282)
   def _reduce_107(val, _values, result)
-          result = Date.new(val[0][0], 1, 1)
+          result = Date.new(val[0][0], 1, val[5])
       result.unspecified.year[2,2] = val[0][1]
-      result.unspecified!([:month, :day])
-    
+      result.unspecified!(:month)
+
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 288)
   def _reduce_108(val, _values, result)
-          result = Date.new(val[0][0], val[2], 1)
+          result = Date.new(val[0][0], 1, 1)
       result.unspecified.year[2,2] = val[0][1]
-      result.unspecified!(:day)
-    
+      result.unspecified!([:month, :day])
+
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 294)
   def _reduce_109(val, _values, result)
-          result = Date.new(val[0], 1, val[5])
-      result.unspecified!(:month)
-    
+          result = Date.new(val[0][0], val[2], 1)
+      result.unspecified.year[2,2] = val[0][1]
+      result.unspecified!(:day)
+
     result
   end
 .,.,
 
-# reduce 110 omitted
+module_eval(<<'.,.,', 'parser.y', 300)
+  def _reduce_110(val, _values, result)
+          result = Date.new(val[0], 1, val[5])
+      result.unspecified!(:month)
 
-module_eval(<<'.,.,', 'parser.y', 301)
-  def _reduce_111(val, _values, result)
-     result = uoa(val[1], val[3]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 304)
+# reduce 111 omitted
+
+module_eval(<<'.,.,', 'parser.y', 307)
   def _reduce_112(val, _values, result)
-     result = val[0].year_precision! 
+     result = uoa(val[1], val[3])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 305)
+module_eval(<<'.,.,', 'parser.y', 310)
   def _reduce_113(val, _values, result)
-     result = val[0][0].month_precision! 
+     result = val[0].year_precision!
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 306)
+module_eval(<<'.,.,', 'parser.y', 311)
   def _reduce_114(val, _values, result)
-     result = val[0].day_precision! 
+     result = val[0][0].month_precision!
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 308)
+module_eval(<<'.,.,', 'parser.y', 312)
   def _reduce_115(val, _values, result)
-     result = uoa(Date.new(val[0]), val[1], :year) 
+     result = val[0].day_precision!
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 312)
+module_eval(<<'.,.,', 'parser.y', 314)
   def _reduce_116(val, _values, result)
-          result = [uoa(val[0].change(:month => val[2]), val[3], [:month, :year])]
-    
+     result = uoa(Date.new(val[0]), val[1], :year)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 315)
+module_eval(<<'.,.,', 'parser.y', 318)
   def _reduce_117(val, _values, result)
-            result = [uoa(Date.new(val[0], val[2]), val[3], [:year, :month])]
-    
+          result = [uoa(val[0].change(:month => val[2]), val[3], [:month, :year])]
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 318)
+module_eval(<<'.,.,', 'parser.y', 321)
   def _reduce_118(val, _values, result)
-            result = [uoa(Date.new(val[0], val[2]), val[4], [:month]), true]
-    
+            result = [uoa(Date.new(val[0], val[2]), val[3], [:year, :month])]
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 321)
+module_eval(<<'.,.,', 'parser.y', 324)
   def _reduce_119(val, _values, result)
-            result = [uoa(val[0].change(:month => val[2]), val[4], [:month]), true]
-    
+            result = [uoa(Date.new(val[0], val[2]), val[4], [:month]), true]
+
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 327)
   def _reduce_120(val, _values, result)
-          result = uoa(val[0][0].change(:day => val[2]), val[3], val[0][1] ? [:day] : nil)
-    
+            result = [uoa(val[0].change(:month => val[2]), val[4], [:month]), true]
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 330)
+module_eval(<<'.,.,', 'parser.y', 333)
   def _reduce_121(val, _values, result)
-            result = uoa(val[0][0].change(:day => val[2]), val[4], [:day])
-    
+          result = uoa(val[0][0].change(:day => val[2]), val[3], val[0][1] ? [:day] : nil)
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 333)
+module_eval(<<'.,.,', 'parser.y', 336)
   def _reduce_122(val, _values, result)
-            result = uoa(uoa(Date.new(val[0], val[2], val[5]), val[4], :month), val[6], :day)
-    
+            result = uoa(val[0][0].change(:day => val[2]), val[4], [:day])
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 336)
+module_eval(<<'.,.,', 'parser.y', 339)
   def _reduce_123(val, _values, result)
-            result = uoa(Date.new(val[0][0], val[0][1], val[2]), val[3])
-    
+            result = uoa(uoa(Date.new(val[0], val[2], val[5]), val[4], :month), val[6], :day)
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 339)
+module_eval(<<'.,.,', 'parser.y', 342)
   def _reduce_124(val, _values, result)
-            result = uoa(Date.new(val[0][0], val[0][1], val[2]), val[4], [:day])
-    
+            result = uoa(Date.new(val[0][0], val[0][1], val[2]), val[3])
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 342)
+module_eval(<<'.,.,', 'parser.y', 345)
   def _reduce_125(val, _values, result)
-            result = uoa(Date.new(val[0], val[2], val[4]), val[6], [:month, :day])
-    
+            result = uoa(Date.new(val[0][0], val[0][1], val[2]), val[4], [:day])
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 345)
+module_eval(<<'.,.,', 'parser.y', 348)
   def _reduce_126(val, _values, result)
+            result = uoa(Date.new(val[0], val[2], val[4]), val[6], [:month, :day])
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 351)
+  def _reduce_127(val, _values, result)
             result = Date.new(val[0], val[2], val[4])
         result = uoa(result, val[6], [:day])
         result = uoa(result, val[8], [:month, :day])
-    
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 350)
-  def _reduce_127(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 356)
+  def _reduce_128(val, _values, result)
             result = val[0].change(:month => val[2], :day => val[4])
         result = uoa(result, val[6], [:month, :day])
-    
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 354)
-  def _reduce_128(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 360)
+  def _reduce_129(val, _values, result)
             result = val[0].change(:month => val[2], :day => val[4])
         result = uoa(result, val[6], [:day])
         result = uoa(result, val[8], [:month, :day])
-    
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 365)
-  def _reduce_129(val, _values, result)
-     result = [] 
+module_eval(<<'.,.,', 'parser.y', 371)
+  def _reduce_130(val, _values, result)
+     result = []
     result
   end
 .,.,
 
-# reduce 130 omitted
+# reduce 131 omitted
 
-module_eval(<<'.,.,', 'parser.y', 369)
-  def _reduce_131(val, _values, result)
-     result = 0 
+module_eval(<<'.,.,', 'parser.y', 375)
+  def _reduce_132(val, _values, result)
+     result = 0
     result
   end
 .,.,
 
-# reduce 132 omitted
-
 # reduce 133 omitted
 
 # reduce 134 omitted
@@ -1602,218 +1611,220 @@ module_eval(<<'.,.,', 'parser.y', 369)
 
 # reduce 141 omitted
 
-module_eval(<<'.,.,', 'parser.y', 375)
-  def _reduce_142(val, _values, result)
-     result = val[1] 
-    result
-  end
-.,.,
+# reduce 142 omitted
 
-module_eval(<<'.,.,', 'parser.y', 376)
+module_eval(<<'.,.,', 'parser.y', 381)
   def _reduce_143(val, _values, result)
-     result = 10 
+     result = val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 377)
+module_eval(<<'.,.,', 'parser.y', 382)
   def _reduce_144(val, _values, result)
-     result = 11 
+     result = 10
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 378)
+module_eval(<<'.,.,', 'parser.y', 383)
   def _reduce_145(val, _values, result)
-     result = 12 
+     result = 11
     result
   end
 .,.,
 
-# reduce 146 omitted
-
-module_eval(<<'.,.,', 'parser.y', 382)
-  def _reduce_147(val, _values, result)
-     result = 13 
+module_eval(<<'.,.,', 'parser.y', 384)
+  def _reduce_146(val, _values, result)
+     result = 12
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 385)
+# reduce 147 omitted
+
+module_eval(<<'.,.,', 'parser.y', 388)
   def _reduce_148(val, _values, result)
-     result = val[1] 
+     result = 13
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 386)
+module_eval(<<'.,.,', 'parser.y', 391)
   def _reduce_149(val, _values, result)
-     result = 10 + val[1] 
+     result = val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 387)
+module_eval(<<'.,.,', 'parser.y', 392)
   def _reduce_150(val, _values, result)
-     result = 20 
+     result = 10 + val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 388)
+module_eval(<<'.,.,', 'parser.y', 393)
   def _reduce_151(val, _values, result)
-     result = 21 
+     result = 20
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 389)
+module_eval(<<'.,.,', 'parser.y', 394)
   def _reduce_152(val, _values, result)
-     result = 22 
+     result = 21
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 390)
+module_eval(<<'.,.,', 'parser.y', 395)
   def _reduce_153(val, _values, result)
-     result = 23 
+     result = 22
     result
   end
 .,.,
 
-# reduce 154 omitted
+module_eval(<<'.,.,', 'parser.y', 396)
+  def _reduce_154(val, _values, result)
+     result = 23
+    result
+  end
+.,.,
 
 # reduce 155 omitted
 
 # reduce 156 omitted
 
-module_eval(<<'.,.,', 'parser.y', 398)
-  def _reduce_157(val, _values, result)
-     result = 24 
-    result
-  end
-.,.,
+# reduce 157 omitted
 
-module_eval(<<'.,.,', 'parser.y', 399)
+module_eval(<<'.,.,', 'parser.y', 404)
   def _reduce_158(val, _values, result)
-     result = 25 
+     result = 24
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 400)
+module_eval(<<'.,.,', 'parser.y', 405)
   def _reduce_159(val, _values, result)
-     result = 26 
+     result = 25
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 401)
+module_eval(<<'.,.,', 'parser.y', 406)
   def _reduce_160(val, _values, result)
-     result = 27 
+     result = 26
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 402)
+module_eval(<<'.,.,', 'parser.y', 407)
   def _reduce_161(val, _values, result)
-     result = 28 
+     result = 27
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 403)
+module_eval(<<'.,.,', 'parser.y', 408)
   def _reduce_162(val, _values, result)
-     result = 29 
+     result = 28
     result
   end
 .,.,
 
-# reduce 163 omitted
-
-module_eval(<<'.,.,', 'parser.y', 407)
-  def _reduce_164(val, _values, result)
-     result = 30 
+module_eval(<<'.,.,', 'parser.y', 409)
+  def _reduce_163(val, _values, result)
+     result = 29
     result
   end
 .,.,
 
-# reduce 165 omitted
+# reduce 164 omitted
 
-module_eval(<<'.,.,', 'parser.y', 411)
-  def _reduce_166(val, _values, result)
-     result = 31 
+module_eval(<<'.,.,', 'parser.y', 413)
+  def _reduce_165(val, _values, result)
+     result = 30
     result
   end
 .,.,
 
-# reduce 167 omitted
+# reduce 166 omitted
 
-module_eval(<<'.,.,', 'parser.y', 415)
-  def _reduce_168(val, _values, result)
-     result = 30 + val[1] 
+module_eval(<<'.,.,', 'parser.y', 417)
+  def _reduce_167(val, _values, result)
+     result = 31
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 416)
+# reduce 168 omitted
+
+module_eval(<<'.,.,', 'parser.y', 421)
   def _reduce_169(val, _values, result)
-     result = 40 + val[1] 
+     result = 30 + val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 417)
+module_eval(<<'.,.,', 'parser.y', 422)
   def _reduce_170(val, _values, result)
-     result = 50 + val[1] 
+     result = 40 + val[1]
     result
   end
 .,.,
 
-# reduce 171 omitted
-
-# reduce 172 omitted
-
-module_eval(<<'.,.,', 'parser.y', 424)
-  def _reduce_173(val, _values, result)
-     result = val[0] 
+module_eval(<<'.,.,', 'parser.y', 423)
+  def _reduce_171(val, _values, result)
+     result = 50 + val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 425)
+# reduce 172 omitted
+
+# reduce 173 omitted
+
+module_eval(<<'.,.,', 'parser.y', 430)
   def _reduce_174(val, _values, result)
-     result = 10 * val[0] + val[1] 
+     result = val[0]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 428)
+module_eval(<<'.,.,', 'parser.y', 431)
   def _reduce_175(val, _values, result)
-               result = val.zip([100,10,1]).reduce(0) { |s,(a,b)| s += a * b }
-         
+     result = 10 * val[0] + val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 432)
+module_eval(<<'.,.,', 'parser.y', 434)
   def _reduce_176(val, _values, result)
-               result = val.zip([1000,100,10,1]).reduce(0) { |s,(a,b)| s += a * b }
-         
+               result = val.zip([100,10,1]).reduce(0) { |s,(a,b)| s += a * b }
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 436)
+module_eval(<<'.,.,', 'parser.y', 438)
   def _reduce_177(val, _values, result)
-     result = val[0] 
+               result = val.zip([1000,100,10,1]).reduce(0) { |s,(a,b)| s += a * b }
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 437)
+module_eval(<<'.,.,', 'parser.y', 442)
   def _reduce_178(val, _values, result)
-     result = 10 * val[0] + val[1] 
+     result = val[0]
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 443)
+  def _reduce_179(val, _values, result)
+     result = 10 * val[0] + val[1]
     result
   end
 .,.,
@@ -1823,4 +1834,4 @@ def _reduce_none(val, _values, result)
 end
 
   end   # class Parser
-  end   # module EDTF
+end   # module EDTF