edtf 3.3.0 → 4.0.0

data/lib/edtf/parser.rb

@@ -871,7 +871,7 @@ Racc_token_to_s_table = [
   "d01_30" ]
 Ractor.make_shareable(Racc_token_to_s_table) if defined?(Ractor)
 
-Racc_debug_parser = false
+Racc_debug_parser = true
 
 ##### State transition tables end #####
 
@@ -889,21 +889,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.gregorian(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.gregorian(*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.gregorian(*val.flatten).day_precision!
     result
   end
 .,.,
@@ -1057,7 +1057,7 @@ module_eval(<<'.,.,', 'parser.y', 93)
 
 module_eval(<<'.,.,', 'parser.y', 99)
   def _reduce_39(val, _values, result)
-                    result = Date.new(val[0][0]).year_precision!
+                    result = Date.gregorian(val[0][0]).year_precision!
                 result.unspecified.year[2,2] = val[0][1]
 
     result
@@ -1099,7 +1099,7 @@ module_eval(<<'.,.,', 'parser.y', 121)
 
 module_eval(<<'.,.,', 'parser.y', 125)
   def _reduce_47(val, _values, result)
-        result = Date.new(val[0]).unspecified!(:month)
+        result = Date.gregorian(val[0]).unspecified!(:month)
     result.precision = :month
 
     result
@@ -1108,7 +1108,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 = Date.gregorian(*val[0]).unspecified!(:day)
 
     result
   end
@@ -1116,7 +1116,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 = Date.gregorian(val[0]).unspecified!([:day,:month])
 
     result
   end
@@ -1212,7 +1212,7 @@ module_eval(<<'.,.,', 'parser.y', 170)
 
 module_eval(<<'.,.,', 'parser.y', 181)
   def _reduce_73(val, _values, result)
-          result = Date.new(val[1])
+          result = Date.gregorian(val[1])
       result.precision = :year
 
     result
@@ -1221,7 +1221,7 @@ module_eval(<<'.,.,', 'parser.y', 181)
 
 module_eval(<<'.,.,', 'parser.y', 186)
   def _reduce_74(val, _values, result)
-          result = Date.new(-1 * val[2])
+          result = Date.gregorian(-1 * val[2])
       result.precision = :year
 
     result
@@ -1305,7 +1305,7 @@ module_eval(<<'.,.,', 'parser.y', 225)
 
 module_eval(<<'.,.,', 'parser.y', 231)
   def _reduce_91(val, _values, result)
-          result = Date.new(val[0].year * 10 ** val[2]).year_precision!
+          result = Date.gregorian(val[0].year * 10 ** val[2]).year_precision!
 
     result
   end
@@ -1313,7 +1313,7 @@ module_eval(<<'.,.,', 'parser.y', 231)
 
 module_eval(<<'.,.,', 'parser.y', 235)
   def _reduce_92(val, _values, result)
-          result = Date.new(val[1] * 10 ** val[3]).year_precision!
+          result = Date.gregorian(val[1] * 10 ** val[3]).year_precision!
 
     result
   end
@@ -1321,7 +1321,7 @@ module_eval(<<'.,.,', 'parser.y', 235)
 
 module_eval(<<'.,.,', 'parser.y', 239)
   def _reduce_93(val, _values, result)
-          result = Date.new(-1 * val[2] * 10 ** val[4]).year_precision!
+          result = Date.gregorian(-1 * val[2] * 10 ** val[4]).year_precision!
 
     result
   end
@@ -1448,49 +1448,49 @@ module_eval(<<'.,.,', 'parser.y', 287)
 
 module_eval(<<'.,.,', 'parser.y', 289)
   def _reduce_114(val, _values, result)
-     result = Date.new(*val[0]).day_precision!
+     result = Date.gregorian(*val[0]).day_precision!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 290)
   def _reduce_115(val, _values, result)
-     result = Date.new(*val[0]).month_precision!
+     result = Date.gregorian(*val[0]).month_precision!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 291)
   def _reduce_116(val, _values, result)
-     result = Date.new(val[0]).year_precision!
+     result = Date.gregorian(val[0]).year_precision!
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 294)
   def _reduce_117(val, _values, result)
-     result = (Date.new(*val[0]).day_precision! .. Date.new(*val[2]).day_precision!)
+     result = (Date.gregorian(*val[0]).day_precision! .. Date.gregorian(*val[2]).day_precision!)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 295)
   def _reduce_118(val, _values, result)
-     result = (Date.new(*val[0]).month_precision! .. Date.new(*val[2]).month_precision!)
+     result = (Date.gregorian(*val[0]).month_precision! .. Date.gregorian(*val[2]).month_precision!)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 296)
   def _reduce_119(val, _values, result)
-     result = (Date.new(val[0]).year_precision! .. Date.new(val[2]).year_precision!)
+     result = (Date.gregorian(val[0]).year_precision! .. Date.gregorian(val[2]).year_precision!)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 302)
   def _reduce_120(val, _values, result)
-          result = Date.new(val[0][0], val[2], val[4])
+          result = Date.gregorian(val[0][0], val[2], val[4])
       result.unspecified.year[2,2] = val[0][1]
 
     result
@@ -1499,7 +1499,7 @@ module_eval(<<'.,.,', 'parser.y', 302)
 
 module_eval(<<'.,.,', 'parser.y', 307)
   def _reduce_121(val, _values, result)
-          result = Date.new(val[0][0], val[2], 1)
+          result = Date.gregorian(val[0][0], val[2], 1)
       result.month_precision!
       result.unspecified.year[2,2] = val[0][1]
 
@@ -1509,7 +1509,7 @@ module_eval(<<'.,.,', 'parser.y', 307)
 
 module_eval(<<'.,.,', 'parser.y', 313)
   def _reduce_122(val, _values, result)
-          result = Date.new(val[0][0], 1, val[5])
+          result = Date.gregorian(val[0][0], 1, val[5])
       result.unspecified.year[2,2] = val[0][1]
       result.unspecified!(:month)
 
@@ -1519,7 +1519,7 @@ module_eval(<<'.,.,', 'parser.y', 313)
 
 module_eval(<<'.,.,', 'parser.y', 319)
   def _reduce_123(val, _values, result)
-          result = Date.new(val[0][0], 1, 1)
+          result = Date.gregorian(val[0][0], 1, 1)
       result.unspecified.year[2,2] = val[0][1]
       result.unspecified!([:month, :day])
 
@@ -1529,7 +1529,7 @@ module_eval(<<'.,.,', 'parser.y', 319)
 
 module_eval(<<'.,.,', 'parser.y', 325)
   def _reduce_124(val, _values, result)
-          result = Date.new(val[0][0], val[2], 1)
+          result = Date.gregorian(val[0][0], val[2], 1)
       result.unspecified.year[2,2] = val[0][1]
       result.unspecified!(:day)
 
@@ -1539,7 +1539,7 @@ module_eval(<<'.,.,', 'parser.y', 325)
 
 module_eval(<<'.,.,', 'parser.y', 331)
   def _reduce_125(val, _values, result)
-          result = Date.new(val[0], 1, val[5])
+          result = Date.gregorian(val[0], 1, val[5])
       result.unspecified!(:month)
 
     result
@@ -1578,7 +1578,7 @@ module_eval(<<'.,.,', 'parser.y', 342)
 
 module_eval(<<'.,.,', 'parser.y', 344)
   def _reduce_131(val, _values, result)
-     result = uoa(Date.new(val[0]), val[1], :year)
+     result = uoa(Date.gregorian(val[0]), val[1], :year)
     result
   end
 .,.,
@@ -1593,7 +1593,7 @@ module_eval(<<'.,.,', 'parser.y', 348)
 
 module_eval(<<'.,.,', 'parser.y', 351)
   def _reduce_133(val, _values, result)
-            result = [uoa(Date.new(val[0], val[2]), val[3], [:year, :month])]
+            result = [uoa(Date.gregorian(val[0], val[2]), val[3], [:year, :month])]
 
     result
   end
@@ -1601,7 +1601,7 @@ module_eval(<<'.,.,', 'parser.y', 351)
 
 module_eval(<<'.,.,', 'parser.y', 354)
   def _reduce_134(val, _values, result)
-            result = [uoa(Date.new(val[0], val[2]), val[4], [:month]), true]
+            result = [uoa(Date.gregorian(val[0], val[2]), val[4], [:month]), true]
 
     result
   end
@@ -1633,7 +1633,7 @@ module_eval(<<'.,.,', 'parser.y', 366)
 
 module_eval(<<'.,.,', 'parser.y', 369)
   def _reduce_138(val, _values, result)
-            result = uoa(uoa(Date.new(val[0], val[2], val[5]), val[4], :month), val[6], :day)
+            result = uoa(uoa(Date.gregorian(val[0], val[2], val[5]), val[4], :month), val[6], :day)
 
     result
   end
@@ -1641,7 +1641,7 @@ module_eval(<<'.,.,', 'parser.y', 369)
 
 module_eval(<<'.,.,', 'parser.y', 372)
   def _reduce_139(val, _values, result)
-            result = uoa(Date.new(val[0][0], val[0][1], val[2]), val[3])
+            result = uoa(Date.gregorian(val[0][0], val[0][1], val[2]), val[3])
 
     result
   end
@@ -1649,7 +1649,7 @@ module_eval(<<'.,.,', 'parser.y', 372)
 
 module_eval(<<'.,.,', 'parser.y', 375)
   def _reduce_140(val, _values, result)
-            result = uoa(Date.new(val[0][0], val[0][1], val[2]), val[4], [:day])
+            result = uoa(Date.gregorian(val[0][0], val[0][1], val[2]), val[4], [:day])
 
     result
   end
@@ -1657,7 +1657,7 @@ module_eval(<<'.,.,', 'parser.y', 375)
 
 module_eval(<<'.,.,', 'parser.y', 378)
   def _reduce_141(val, _values, result)
-            result = uoa(Date.new(val[0], val[2], val[4]), val[6], [:month, :day])
+            result = uoa(Date.gregorian(val[0], val[2], val[4]), val[6], [:month, :day])
 
     result
   end
@@ -1665,7 +1665,7 @@ module_eval(<<'.,.,', 'parser.y', 378)
 
 module_eval(<<'.,.,', 'parser.y', 381)
   def _reduce_142(val, _values, result)
-            result = Date.new(val[0], val[2], val[4])
+            result = Date.gregorian(val[0], val[2], val[4])
         result = uoa(result, val[6], [:day])
         result = uoa(result, val[8], [:month, :day])
 

data/lib/edtf/parser.y

@@ -21,9 +21,9 @@ rule
                      ;
 
   date :
-    year             { result = Date.new(val[0]).year_precision! }
-    | year_month     { result = Date.new(*val.flatten).month_precision! }
-    | year_month_day { result = Date.new(*val.flatten).day_precision! }
+    year             { result = Date.gregorian(val[0]).year_precision! }
+    | year_month     { result = Date.gregorian(*val.flatten).month_precision! }
+    | year_month_day { result = Date.gregorian(*val.flatten).day_precision! }
     ;
 
 
@@ -97,7 +97,7 @@ rule
 
   unspecified : unspecified_year
               {
-                result = Date.new(val[0][0]).year_precision!
+                result = Date.gregorian(val[0][0]).year_precision!
                 result.unspecified.year[2,2] = val[0][1]
               }
               | unspecified_month
@@ -123,16 +123,16 @@ rule
     }
 
   unspecified_month : year '-' U U {
-    result = Date.new(val[0]).unspecified!(:month)
+    result = Date.gregorian(val[0]).unspecified!(:month)
     result.precision = :month
   }
 
   unspecified_day : year_month '-' U U {
-    result = Date.new(*val[0]).unspecified!(:day)
+    result = Date.gregorian(*val[0]).unspecified!(:day)
   }
 
   unspecified_day_and_month : year '-' U U '-' U U {
-    result = Date.new(val[0]).unspecified!([:day,:month])
+    result = Date.gregorian(val[0]).unspecified!([:day,:month])
   }
 
   level_1_interval : level_1_interval_closed | level_1_interval_open | level_1_interval_unknown
@@ -179,12 +179,12 @@ rule
   long_year_simple :
     LONGYEAR long_year
     {
-      result = Date.new(val[1])
+      result = Date.gregorian(val[1])
       result.precision = :year
     }
     | LONGYEAR '-' long_year
     {
-      result = Date.new(-1 * val[2])
+      result = Date.gregorian(-1 * val[2])
       result.precision = :year
     }
     ;
@@ -229,15 +229,15 @@ rule
   long_year_scientific :
     long_year_simple E integer
     {
-      result = Date.new(val[0].year * 10 ** val[2]).year_precision!
+      result = Date.gregorian(val[0].year * 10 ** val[2]).year_precision!
     }
     | LONGYEAR int1_4 E integer
     {
-      result = Date.new(val[1] * 10 ** val[3]).year_precision!
+      result = Date.gregorian(val[1] * 10 ** val[3]).year_precision!
     }
     | LONGYEAR '-' int1_4 E integer
     {
-      result = Date.new(-1 * val[2] * 10 ** val[4]).year_precision!
+      result = Date.gregorian(-1 * val[2] * 10 ** val[4]).year_precision!
     }
     ;
 
@@ -287,49 +287,49 @@ rule
 
   earlier : DOTS date { result = val[1] }
 
-  later : year_month_day DOTS { result = Date.new(*val[0]).day_precision! }
-        | year_month DOTS     { result = Date.new(*val[0]).month_precision! }
-        | year DOTS           { result = Date.new(val[0]).year_precision! }
+  later : year_month_day DOTS { result = Date.gregorian(*val[0]).day_precision! }
+        | year_month DOTS     { result = Date.gregorian(*val[0]).month_precision! }
+        | year DOTS           { result = Date.gregorian(val[0]).year_precision! }
         ;
 
-  consecutives : year_month_day DOTS year_month_day { result = (Date.new(*val[0]).day_precision! .. Date.new(*val[2]).day_precision!) }
-               | year_month DOTS year_month         { result = (Date.new(*val[0]).month_precision! .. Date.new(*val[2]).month_precision!) }
-               | year DOTS year                     { result = (Date.new(val[0]).year_precision! .. Date.new(val[2]).year_precision!) }
+  consecutives : year_month_day DOTS year_month_day { result = (Date.gregorian(*val[0]).day_precision! .. Date.gregorian(*val[2]).day_precision!) }
+               | year_month DOTS year_month         { result = (Date.gregorian(*val[0]).month_precision! .. Date.gregorian(*val[2]).month_precision!) }
+               | year DOTS year                     { result = (Date.gregorian(val[0]).year_precision! .. Date.gregorian(val[2]).year_precision!) }
                ;
 
   partial_unspecified :
     unspecified_year '-' month '-' day
     {
-      result = Date.new(val[0][0], val[2], val[4])
+      result = Date.gregorian(val[0][0], val[2], val[4])
       result.unspecified.year[2,2] = val[0][1]
     }
     | unspecified_year '-' month
     {
-      result = Date.new(val[0][0], val[2], 1)
+      result = Date.gregorian(val[0][0], val[2], 1)
       result.month_precision!
       result.unspecified.year[2,2] = val[0][1]
     }
     | unspecified_year '-' U U '-' day
     {
-      result = Date.new(val[0][0], 1, val[5])
+      result = Date.gregorian(val[0][0], 1, val[5])
       result.unspecified.year[2,2] = val[0][1]
       result.unspecified!(:month)
     }
     | unspecified_year '-' U U '-' U U
     {
-      result = Date.new(val[0][0], 1, 1)
+      result = Date.gregorian(val[0][0], 1, 1)
       result.unspecified.year[2,2] = val[0][1]
       result.unspecified!([:month, :day])
     }
     | unspecified_year '-' month '-' U U
     {
-      result = Date.new(val[0][0], val[2], 1)
+      result = Date.gregorian(val[0][0], val[2], 1)
       result.unspecified.year[2,2] = val[0][1]
       result.unspecified!(:day)
     }
     | year '-' U U '-' day
     {
-      result = Date.new(val[0], 1, val[5])
+      result = Date.gregorian(val[0], 1, val[5])
       result.unspecified!(:month)
     }
     ;
@@ -342,17 +342,17 @@ rule
     | pua_year_month     { result = val[0][0].month_precision! }
     | pua_year_month_day { result = val[0].day_precision! }
 
-  pua_year : year UA { result = uoa(Date.new(val[0]), val[1], :year) }
+  pua_year : year UA { result = uoa(Date.gregorian(val[0]), val[1], :year) }
 
   pua_year_month :
     pua_year '-' month ua {
       result = [uoa(val[0].change(:month => val[2]), val[3], [:month, :year])]
     }
     | year '-' month UA {
-        result = [uoa(Date.new(val[0], val[2]), val[3], [:year, :month])]
+        result = [uoa(Date.gregorian(val[0], val[2]), val[3], [:year, :month])]
     }
     | year '-(' month ')' UA {
-        result = [uoa(Date.new(val[0], val[2]), val[4], [:month]), true]
+        result = [uoa(Date.gregorian(val[0], val[2]), val[4], [:month]), true]
     }
     | pua_year '-(' month ')' UA {
         result = [uoa(val[0].change(:month => val[2]), val[4], [:month]), true]
@@ -367,19 +367,19 @@ rule
         result = uoa(val[0][0].change(:day => val[2]), val[4], [:day])
     }
     | year '-(' month ')' UA day ua {
-        result = uoa(uoa(Date.new(val[0], val[2], val[5]), val[4], :month), val[6], :day)
+        result = uoa(uoa(Date.gregorian(val[0], val[2], val[5]), val[4], :month), val[6], :day)
     }
     | year_month '-' day UA {
-        result = uoa(Date.new(val[0][0], val[0][1], val[2]), val[3])
+        result = uoa(Date.gregorian(val[0][0], val[0][1], val[2]), val[3])
     }
     | year_month '-(' day ')' UA {
-        result = uoa(Date.new(val[0][0], val[0][1], val[2]), val[4], [:day])
+        result = uoa(Date.gregorian(val[0][0], val[0][1], val[2]), val[4], [:day])
     }
     | year '-(' month '-' day ')' UA {
-        result = uoa(Date.new(val[0], val[2], val[4]), val[6], [:month, :day])
+        result = uoa(Date.gregorian(val[0], val[2], val[4]), val[6], [:month, :day])
     }
     | year '-(' month '-(' day ')' UA ')' UA {
-        result = Date.new(val[0], val[2], val[4])
+        result = Date.gregorian(val[0], val[2], val[4])
         result = uoa(result, val[6], [:day])
         result = uoa(result, val[8], [:month, :day])
     }

data/lib/edtf/season.rb

@@ -130,7 +130,13 @@ module EDTF
     def qualified?; !!@qualifier; end
 
     def edtf
-      '%04d-%2d%s' % [year, CODES[season], qualified? ? "^#{qualifier}" : '']
+      '%04d-%2d%s%s%s' % [
+        year,
+        CODES[season],
+        uncertain? ? '?' : '',
+        approximate? ? '~' : '',
+        qualified? ? "^#{qualifier}" : ''
+      ]
     end
 
     alias to_s edtf
@@ -140,7 +146,9 @@ module EDTF
       case other
       when Date
         cover?(other) ? 0 : to_date <=> other
-      when Interval, Epoch
+      when Interval
+        (c = other <=> self) && -c
+      when Epoch
         [min, max] <=> [other.min, other.max]
       when Season
         [year, month, qualifier] <=> [other.year, other.month, other.qualifier]

data/lib/edtf/set.rb

@@ -7,7 +7,6 @@ module EDTF
     include Comparable
 
     def_delegators :@dates, :size, :length, :empty?
-    def_delegators :to_a, :include?
 
     attr_accessor :choice, :later, :earlier
 
@@ -29,6 +28,21 @@ module EDTF
       end
     end
 
+    def include?(v)
+      return false unless v.is_a?(Date)
+      return false if empty?
+
+      dates_array = to_a
+      if earlier?
+        (min = dates_array.first) >= v && min.precision == v.precision
+      elsif later?
+        (max = dates_array.last) <= v && max.precision == v.precision
+      else
+        dates_array.member?(v)
+      end
+    end
+    alias member? include?
+
     def <<(date)
       dates << date
       self

data/lib/edtf/uncertainty.rb

@@ -12,7 +12,6 @@ module EDTF
     end
 
     def hash_base=(base)
-      @hash_map = false
       @hash_base = base
     end
 
@@ -37,13 +36,7 @@ module EDTF
     end
 
     def hash
-      values.zip(hash_map).reduce(0) { |s, (v, h)|  s + (v ? h : 0) }
-    end
-
-    private
-
-    def hash_map
-      @hash_map ||= (0...length).map { |i| hash_base << i }
+      (year ? hash_base : 0) + (month ? hash_base << 1 : 0) + (day ? hash_base << 2 : 0)
     end
 
   end
@@ -79,6 +72,12 @@ module EDTF
     alias specific! specified!
     alias unspecific! unspecified!
 
+    def hash
+      y, m, d = year, month, day
+      (y[0] ? 1 : 0) | (y[1] ? 2 : 0) | (y[2] ? 4 : 0) | (y[3] ? 8 : 0) |
+        (m[0] ? 16 : 0) | (m[1] ? 32 : 0) | (d[0] ? 64 : 0) | (d[1] ? 128 : 0)
+    end
+
     private :year=, :month=, :day=
 
     def to_s

data/lib/edtf/version.rb

@@ -1,3 +1,3 @@
 module EDTF
-  VERSION = '3.3.0'.freeze
+  VERSION = '4.0.0'.freeze
 end