edtf 2.1.0 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +2 -2
  3. data/Gemfile +8 -3
  4. data/README.md +8 -8
  5. data/features/parser/date_times.feature +3 -3
  6. data/features/print/level_0_edtf.feature +61 -61
  7. data/features/step_definitions/edtf_steps.rb +25 -25
  8. data/features/support/env.rb +1 -1
  9. data/lib/edtf/date.rb +6 -3
  10. data/lib/edtf/date_time.rb +10 -1
  11. data/lib/edtf/parser.rb +344 -343
  12. data/lib/edtf/parser.y +29 -28
  13. data/lib/edtf/set.rb +3 -1
  14. data/lib/edtf/version.rb +1 -1
  15. data/spec/edtf/date_spec.rb +39 -39
  16. data/spec/edtf/epoch_spec.rb +15 -15
  17. data/spec/edtf/interval_spec.rb +35 -35
  18. data/spec/edtf/parser_spec.rb +123 -123
  19. data/spec/edtf/season_spec.rb +22 -21
  20. data/spec/edtf/set_spec.rb +71 -71
  21. data/spec/edtf/uncertainty_spec.rb +42 -42
  22. data/spec/spec_helper.rb +1 -1
  23. metadata +5 -4
data/lib/edtf/date_time.rb CHANGED
@@ -1,9 +1,18 @@
1
1
  class DateTime
2
2
 
3
- alias edtf iso8601
3
+ def edtf
4
+ date = super
5
+
6
+ time = strftime('%H:%M:%S')
7
+ time << strftime('%Z') unless skip_timezone?
8
+
9
+ [date, time].join('T')
10
+ end
11
+
4
12
  alias to_edtf edtf
5
13
 
6
14
  def values
7
15
  super().concat([hour,minute,second,offset])
8
16
  end
17
+
9
18
  end
data/lib/edtf/parser.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  #
2
2
  # DO NOT MODIFY!!!!
3
- # This file is automatically generated by Racc 1.4.10
3
+ # This file is automatically generated by Racc 1.4.12
4
4
  # from Racc grammer file "".
5
5
  #
6
6
 
@@ -11,7 +11,7 @@ require 'strscan'
11
11
  module EDTF
12
12
  class Parser < Racc::Parser
13
13
 
14
- module_eval(<<'...end parser.y/module_eval...', 'parser.y', 440)
14
+ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 441)
15
15
 
16
16
  @defaults = {
17
17
  :level => 2,
@@ -132,218 +132,218 @@ module_eval(<<'...end parser.y/module_eval...', 'parser.y', 440)
132
132
  ##### State transition tables begin ###
133
133
 
134
134
  racc_action_table = [
135
- 129, 128, 52, 111, 275, 112, 149, 208, 207, 57,
136
- 236, 43, 45, 40, 55, 42, 214, 44, 43, 45,
137
- 40, -48, 42, 53, 44, 180, 58, 46, 47, 48,
138
- 49, 50, 207, 56, 46, 47, 48, 49, 50, 128,
139
- 159, 229, 43, 45, 40, 55, 42, 157, 44, 43,
140
- 45, 40, 55, 42, 54, 44, 57, 58, 46, 47,
141
- 48, 49, 50, 215, 56, 46, 47, 48, 49, 50,
142
- 25, 56, 26, 58, 190, 253, 111, 12, 112, 43,
143
- 45, 40, 254, 42, 94, 44, 255, 33, 92, 34,
144
- 189, 191, 36, 25, 141, 46, 47, 48, 49, 50,
145
- 12, 95, 43, 45, 40, 93, 42, 200, 44, 201,
146
- 213, 148, 55, 108, 147, 36, 212, 258, 46, 47,
135
+ 129, 128, 52, 111, 51, 112, 149, 208, 207, 57,
136
+ -50, 43, 45, 40, 55, 42, 54, 44, 43, 45,
137
+ 40, -48, 42, 53, 44, 64, 58, 46, 47, 48,
138
+ 49, 50, 128, 56, 46, 47, 48, 49, 50, 207,
139
+ 57, 65, 43, 45, 40, 55, 42, 157, 44, 43,
140
+ 45, 40, 55, 42, 214, 44, 92, 58, 46, 47,
141
+ 48, 49, 50, 66, 56, 46, 47, 48, 49, 50,
142
+ 25, 56, 26, 93, 94, 67, 108, 12, -65, 43,
143
+ 45, 40, -66, 42, 159, 44, 110, 33, 111, 34,
144
+ 112, 95, 36, 25, 141, 46, 47, 48, 49, 50,
145
+ 12, 58, 43, 45, 40, 101, 42, 103, 44, 104,
146
+ 96, 148, 55, 133, 147, 36, 124, 125, 46, 47,
147
147
  48, 49, 50, 87, 165, 111, 12, 112, 43, 45,
148
- 40, 56, 42, 210, 44, 166, 111, 244, 112, 239,
149
- 167, 36, 209, 261, 46, 47, 48, 49, 50, 87,
150
- 133, 108, 12, 202, 43, 45, 40, 111, 42, 112,
151
- 44, 110, 111, 111, 112, 112, 193, 36, 233, 192,
148
+ 40, 56, 42, 146, 44, 166, 111, 150, 112, 218,
149
+ 167, 36, 152, 153, 46, 47, 48, 49, 50, 87,
150
+ 108, 111, 12, 112, 43, 45, 40, 188, 42, 186,
151
+ 44, 187, 111, 190, 112, 154, 111, 36, 112, 156,
152
+ 46, 47, 48, 49, 50, 69, 158, 43, 45, 189,
153
+ 191, 42, 12, 44, 43, 45, 40, 200, 42, 201,
154
+ 44, 168, 177, 46, 47, 48, 49, 50, 233, 178,
152
155
  46, 47, 48, 49, 50, 12, 180, 43, 45, 40,
153
- 240, 42, 239, 44, 232, 234, 111, 264, 112, 124,
154
- 36, 218, 125, 46, 47, 48, 49, 50, 12, 178,
155
- 43, 45, 40, 111, 42, 112, 44, 188, 118, 186,
156
- 117, 187, 104, 36, 121, 265, 46, 47, 48, 49,
157
- 50, 12, 192, 43, 45, 40, 266, 42, 177, 44,
158
- 12, 168, 43, 45, 40, 269, 42, 270, 44, 46,
159
- 47, 48, 49, 50, 158, 36, 156, 154, 46, 47,
160
- 48, 49, 50, 69, 180, 43, 45, 153, 152, 42,
161
- 150, 44, 43, 45, 40, 101, 42, 103, 44, 104,
162
- 146, 46, 47, 48, 49, 50, 280, 125, 46, 47,
163
- 48, 49, 50, 43, 45, 40, 124, 42, 284, 44,
164
- 43, 45, 40, 285, 42, 286, 44, 96, -66, 46,
165
- 47, 48, 49, 50, -65, 290, 46, 47, 48, 49,
166
- 50, 43, 45, 40, 67, 42, 292, 44, 43, 45,
167
- 40, 293, 42, 66, 44, 295, 296, 46, 47, 48,
168
- 49, 50, 297, 65, 46, 47, 48, 49, 50, 43,
169
- 45, 40, 300, 42, 301, 44, 43, 45, 40, 180,
170
- 42, 303, 44, 304, 305, 46, 47, 48, 49, 50,
171
- 281, 306, 46, 47, 48, 49, 50, 43, 45, 40,
172
- 307, 42, 308, 44, 43, 45, 64, -50, 42, 311,
173
- 44, 312, 313, 46, 47, 48, 49, 50, 314, 51,
174
- 46, 47, 48, 49, 50, 43, 45, 40, 316, 42,
175
- 317, 44, 43, 45, 175, 318, 42, 319, 44, nil,
176
- nil, 46, 47, 48, 49, 50, nil, nil, 46, 47,
177
- 48, 49, 50, 43, 45, 40, nil, 42, nil, 44,
178
- 43, 45, nil, nil, 42, nil, 44, nil, nil, 46,
179
- 47, 48, 49, 50, nil, nil, 46, 47, 48, 49,
180
- 50, 43, 45, 40, nil, 42, nil, 44, 43, 45,
181
- 40, nil, 42, nil, 44, nil, nil, 46, 47, 48,
182
- 49, 50, nil, nil, 46, 47, 48, 49, 50, 43,
183
- 45, 40, nil, 42, nil, 44, 43, 45, nil, nil,
184
- 42, nil, 44, nil, nil, 46, 47, 48, 49, 50,
185
- nil, nil, 46, 47, 48, 49, 50, 43, 45, 40,
186
- nil, 42, nil, 44, 43, 45, 40, nil, 42, nil,
187
- 44, nil, nil, 46, 47, 48, 49, 50, nil, nil,
188
- 46, 47, 48, 49, 50, 43, 45, 40, nil, 42,
189
- nil, 44, 43, 45, nil, nil, 42, nil, 44, nil,
190
- nil, 46, 47, 48, 49, 50, nil, nil, 46, 47,
191
- 48, 49, 50, 43, 45, 40, nil, 42, nil, 44,
192
- 43, 45, 40, nil, 42, nil, 44, nil, nil, 46,
193
- 47, 48, 49, 50, nil, nil, 46, 47, 48, 49,
194
- 50, 172, 194, 170, nil, 171, nil, 173, 43, 45,
195
- 40, nil, 42, nil, 44, nil, nil, 195, 196, 197,
196
- 198, 199, nil, nil, 46, 47, 48, 49, 50, 43,
197
- 45, 40, nil, 42, nil, 44, 43, 45, 40, nil,
198
- 42, nil, 44, nil, nil, 46, 47, 48, 49, 50,
199
- nil, nil, 46, 47, 48, 49, 50, 43, 45, 276,
200
- nil, 42, nil, 44, 43, 45, 274, nil, 42, nil,
201
- 44, nil, nil, 46, 47, 48, 49, 50, nil, nil,
202
- 46, 47, 48, 49, 50, 43, 45, 40, nil, 42,
203
- nil, 44, 43, 45, 273, nil, 42, nil, 44, nil,
204
- nil, 46, 47, 48, 49, 50, nil, nil, 46, 47,
205
- 48, 49, 50, 43, 45, nil, nil, 42, nil, 44,
206
- 43, 45, 315, nil, 42, nil, 44, nil, nil, 46,
207
- 47, 48, 49, 50, nil, nil, 46, 47, 48, 49,
208
- 50, 43, 45, nil, nil, 42, nil, 44, 43, 45,
209
- 40, nil, 42, nil, 44, nil, nil, 46, 47, 48,
210
- 49, 50, 116, nil, 46, 47, 48, 49, 50, 118,
211
- 250, 310, 118, 104, 117, 249, 104, nil, 121, nil,
212
- 118, 250, 117, nil, 104, 251, 249, 118, 250, 247,
213
- nil, 104, nil, 249, nil, 288, 251, nil, 118, 250,
214
- 247, nil, 104, 251, 249, 118, nil, 117, 281, 104,
215
- nil, 121, nil, 260, 251, 118, 250, 247, 118, 104,
216
- 117, 249, 104, 118, 121, 117, 118, 104, 117, 121,
217
- 104, 251, 121, 118, 118, 117, 117, 104, 104, 121,
218
- 121, 188, 271, 186, 118, 187, 117, 272, 104, 118,
219
- 121, 117, 118, 104, 117, 121, 104, nil, 121, 182,
220
- 184, nil, nil, 181, nil, 183, 172, 169, 170, 118,
221
- 171, 117, 173, 104, 118, 121, 117, 118, 104, 117,
222
- 121, 104, nil, 121 ]
156
+ 111, 42, 112, 44, 232, 234, 111, 240, 112, 239,
157
+ 36, 192, 193, 46, 47, 48, 49, 50, 12, 202,
158
+ 43, 45, 40, 118, 42, 117, 44, 104, 118, 121,
159
+ 117, 209, 104, 36, 121, 210, 46, 47, 48, 49,
160
+ 50, 12, 212, 43, 45, 40, 244, 42, 239, 44,
161
+ 213, 43, 45, 40, 215, 42, 36, 44, 229, 46,
162
+ 47, 48, 49, 50, 180, 180, 236, 46, 47, 48,
163
+ 49, 50, 43, 45, 40, 253, 42, 254, 44, 43,
164
+ 45, 40, 255, 42, 258, 44, 261, 264, 46, 47,
165
+ 48, 49, 50, 124, 125, 46, 47, 48, 49, 50,
166
+ 43, 45, 40, 265, 42, 192, 44, 43, 45, 266,
167
+ 269, 42, 270, 44, 275, 280, 46, 47, 48, 49,
168
+ 50, 284, 285, 46, 47, 48, 49, 50, 43, 45,
169
+ 40, 286, 42, 290, 44, 43, 45, 292, 293, 42,
170
+ 295, 44, 296, 297, 46, 47, 48, 49, 50, 300,
171
+ 301, 46, 47, 48, 49, 50, 43, 45, 40, 180,
172
+ 42, 303, 44, 43, 45, 40, 304, 42, 305, 44,
173
+ 281, 306, 46, 47, 48, 49, 50, 307, 308, 46,
174
+ 47, 48, 49, 50, 43, 45, 175, 311, 42, 312,
175
+ 44, 43, 45, 40, 313, 42, 314, 44, 316, 317,
176
+ 46, 47, 48, 49, 50, 318, 319, 46, 47, 48,
177
+ 49, 50, 43, 45, nil, nil, 42, nil, 44, 43,
178
+ 45, nil, nil, 42, nil, 44, nil, nil, 46, 47,
179
+ 48, 49, 50, nil, nil, 46, 47, 48, 49, 50,
180
+ 172, 194, 170, nil, 171, nil, 173, 43, 45, 40,
181
+ nil, 42, nil, 44, nil, nil, 195, 196, 197, 198,
182
+ 199, nil, nil, 46, 47, 48, 49, 50, 43, 45,
183
+ 40, nil, 42, nil, 44, 43, 45, 40, nil, 42,
184
+ nil, 44, nil, nil, 46, 47, 48, 49, 50, nil,
185
+ nil, 46, 47, 48, 49, 50, 43, 45, 40, nil,
186
+ 42, nil, 44, 43, 45, nil, nil, 42, nil, 44,
187
+ nil, nil, 46, 47, 48, 49, 50, nil, nil, 46,
188
+ 47, 48, 49, 50, 43, 45, 40, nil, 42, nil,
189
+ 44, 43, 45, 40, nil, 42, nil, 44, nil, nil,
190
+ 46, 47, 48, 49, 50, nil, nil, 46, 47, 48,
191
+ 49, 50, 43, 45, 40, nil, 42, nil, 44, 43,
192
+ 45, 40, nil, 42, nil, 44, nil, nil, 46, 47,
193
+ 48, 49, 50, nil, nil, 46, 47, 48, 49, 50,
194
+ 43, 45, nil, nil, 42, nil, 44, 43, 45, 40,
195
+ nil, 42, nil, 44, nil, nil, 46, 47, 48, 49,
196
+ 50, nil, nil, 46, 47, 48, 49, 50, 43, 45,
197
+ 40, nil, 42, nil, 44, 43, 45, 273, nil, 42,
198
+ nil, 44, nil, nil, 46, 47, 48, 49, 50, nil,
199
+ nil, 46, 47, 48, 49, 50, 43, 45, 274, nil,
200
+ 42, nil, 44, 43, 45, 276, nil, 42, nil, 44,
201
+ nil, nil, 46, 47, 48, 49, 50, nil, nil, 46,
202
+ 47, 48, 49, 50, 43, 45, 40, nil, 42, nil,
203
+ 44, 43, 45, 40, nil, 42, nil, 44, nil, nil,
204
+ 46, 47, 48, 49, 50, nil, nil, 46, 47, 48,
205
+ 49, 50, 43, 45, 40, nil, 42, nil, 44, 43,
206
+ 45, 40, nil, 42, nil, 44, nil, nil, 46, 47,
207
+ 48, 49, 50, nil, nil, 46, 47, 48, 49, 50,
208
+ 43, 45, 40, nil, 42, nil, 44, 43, 45, 315,
209
+ nil, 42, nil, 44, nil, nil, 46, 47, 48, 49,
210
+ 50, 116, nil, 46, 47, 48, 49, 50, 118, 250,
211
+ 247, 118, 104, 117, 249, 104, 260, 121, nil, 281,
212
+ nil, nil, nil, nil, 251, nil, 118, 288, 117, 118,
213
+ 104, 117, 121, 104, 118, 121, 117, 118, 104, 117,
214
+ 121, 104, nil, 121, 118, 250, 247, nil, 104, nil,
215
+ 249, 118, 250, 247, nil, 104, nil, 249, nil, nil,
216
+ 251, nil, 118, 250, 117, nil, 104, 251, 249, 118,
217
+ 250, 310, nil, 104, nil, 249, nil, nil, 251, nil,
218
+ 172, 169, 170, nil, 171, 251, 173, 182, 184, nil,
219
+ 118, 181, 117, 183, 104, 118, 121, 117, 118, 104,
220
+ 117, 121, 104, 118, 121, 117, 118, 104, 117, 121,
221
+ 104, 118, 121, 117, nil, 104, nil, 121, 188, 271,
222
+ 186, 118, 187, 117, 272, 104, nil, 121 ]
223
223
 
224
224
  racc_action_check = [
225
- 63, 63, 5, 93, 245, 93, 73, 127, 127, 73,
226
- 163, 63, 63, 63, 134, 63, 134, 63, 127, 127,
227
- 127, 5, 127, 5, 127, 160, 73, 63, 63, 63,
228
- 63, 63, 224, 134, 127, 127, 127, 127, 127, 151,
229
- 91, 158, 224, 224, 224, 89, 224, 89, 224, 151,
230
- 151, 151, 9, 151, 9, 151, 10, 91, 224, 224,
231
- 224, 224, 224, 144, 89, 151, 151, 151, 151, 151,
232
- 0, 9, 0, 10, 113, 169, 56, 0, 56, 0,
233
- 0, 0, 178, 0, 38, 0, 189, 0, 37, 0,
234
- 113, 113, 0, 67, 67, 0, 0, 0, 0, 0,
235
- 67, 38, 67, 67, 67, 37, 67, 121, 67, 121,
236
- 133, 72, 72, 214, 72, 67, 132, 202, 67, 67,
237
- 67, 67, 67, 34, 98, 214, 34, 214, 34, 34,
238
- 34, 72, 34, 129, 34, 98, 157, 167, 157, 167,
239
- 98, 34, 128, 213, 34, 34, 34, 34, 34, 33,
240
- 66, 54, 33, 123, 33, 33, 33, 124, 33, 124,
241
- 33, 54, 66, 54, 66, 54, 116, 33, 161, 115,
242
- 33, 33, 33, 33, 33, 153, 109, 153, 153, 153,
243
- 166, 153, 166, 153, 161, 161, 92, 218, 92, 220,
244
- 153, 147, 222, 153, 153, 153, 153, 153, 154, 108,
245
- 154, 154, 154, 147, 154, 147, 154, 112, 191, 112,
246
- 191, 112, 191, 154, 191, 225, 154, 154, 154, 154,
247
- 154, 87, 230, 87, 87, 87, 232, 87, 107, 87,
248
- 265, 99, 265, 265, 265, 236, 265, 238, 265, 87,
249
- 87, 87, 87, 87, 90, 265, 88, 79, 265, 265,
250
- 265, 265, 265, 26, 162, 26, 26, 78, 77, 26,
251
- 74, 26, 12, 12, 12, 52, 12, 52, 12, 52,
252
- 71, 26, 26, 26, 26, 26, 253, 60, 12, 12,
253
- 12, 12, 12, 263, 263, 263, 59, 263, 256, 263,
254
- 150, 150, 150, 257, 150, 260, 150, 51, 24, 263,
255
- 263, 263, 263, 263, 23, 264, 150, 150, 150, 150,
256
- 150, 36, 36, 36, 22, 36, 267, 36, 217, 217,
257
- 217, 268, 217, 18, 217, 271, 273, 36, 36, 36,
258
- 36, 36, 274, 17, 217, 217, 217, 217, 217, 104,
259
- 104, 104, 280, 104, 281, 104, 149, 149, 149, 283,
260
- 149, 284, 149, 285, 288, 104, 104, 104, 104, 104,
261
- 290, 292, 149, 149, 149, 149, 149, 148, 148, 148,
262
- 293, 148, 295, 148, 146, 146, 16, 14, 146, 300,
263
- 146, 304, 307, 148, 148, 148, 148, 148, 308, 1,
264
- 146, 146, 146, 146, 146, 145, 145, 145, 311, 145,
265
- 312, 145, 103, 103, 103, 313, 103, 316, 103, nil,
266
- nil, 145, 145, 145, 145, 145, nil, nil, 103, 103,
267
- 103, 103, 103, 143, 143, 143, nil, 143, nil, 143,
268
- 111, 111, nil, nil, 111, nil, 111, nil, nil, 143,
269
- 143, 143, 143, 143, nil, nil, 111, 111, 111, 111,
270
- 111, 130, 130, 130, nil, 130, nil, 130, 62, 62,
271
- 62, nil, 62, nil, 62, nil, nil, 130, 130, 130,
272
- 130, 130, nil, nil, 62, 62, 62, 62, 62, 216,
273
- 216, 216, nil, 216, nil, 216, 64, 64, nil, nil,
274
- 64, nil, 64, nil, nil, 216, 216, 216, 216, 216,
275
- nil, nil, 64, 64, 64, 64, 64, 205, 205, 205,
276
- nil, 205, nil, 205, 262, 262, 262, nil, 262, nil,
277
- 262, nil, nil, 205, 205, 205, 205, 205, nil, nil,
278
- 262, 262, 262, 262, 262, 68, 68, 68, nil, 68,
279
- nil, 68, 69, 69, nil, nil, 69, nil, 69, nil,
280
- nil, 68, 68, 68, 68, 68, nil, nil, 69, 69,
281
- 69, 69, 69, 70, 70, 70, nil, 70, nil, 70,
282
- 251, 251, 251, nil, 251, nil, 251, nil, nil, 70,
283
- 70, 70, 70, 70, nil, nil, 251, 251, 251, 251,
284
- 251, 118, 118, 118, nil, 118, nil, 118, 250, 250,
285
- 250, nil, 250, nil, 250, nil, nil, 118, 118, 118,
286
- 118, 118, nil, nil, 250, 250, 250, 250, 250, 75,
287
- 75, 75, nil, 75, nil, 75, 249, 249, 249, nil,
288
- 249, nil, 249, nil, nil, 75, 75, 75, 75, 75,
289
- nil, nil, 249, 249, 249, 249, 249, 247, 247, 247,
290
- nil, 247, nil, 247, 244, 244, 244, nil, 244, nil,
291
- 244, nil, nil, 247, 247, 247, 247, 247, nil, nil,
292
- 244, 244, 244, 244, 244, 13, 13, 13, nil, 13,
293
- nil, 13, 240, 240, 240, nil, 240, nil, 240, nil,
294
- nil, 13, 13, 13, 13, 13, nil, nil, 240, 240,
295
- 240, 240, 240, 215, 215, nil, nil, 215, nil, 215,
296
- 310, 310, 310, nil, 310, nil, 310, nil, nil, 215,
297
- 215, 215, 215, 215, nil, nil, 310, 310, 310, 310,
298
- 310, 117, 117, nil, nil, 117, nil, 117, 126, 126,
299
- 126, nil, 126, nil, 126, nil, nil, 117, 117, 117,
300
- 117, 117, 57, nil, 126, 126, 126, 126, 126, 297,
301
- 297, 297, 57, 297, 57, 297, 57, nil, 57, nil,
302
- 296, 296, 296, nil, 296, 297, 296, 275, 275, 275,
303
- nil, 275, nil, 275, nil, 261, 296, nil, 270, 270,
304
- 270, nil, 270, 275, 270, 261, nil, 261, 254, 261,
305
- nil, 261, nil, 212, 270, 168, 168, 168, 254, 168,
306
- 254, 168, 254, 212, 254, 212, 233, 212, 233, 212,
307
- 233, 168, 233, 125, 159, 125, 159, 125, 159, 125,
308
- 159, 239, 239, 239, 190, 239, 190, 239, 190, 255,
309
- 190, 255, 234, 255, 234, 255, 234, nil, 234, 110,
310
- 110, nil, nil, 110, nil, 110, 101, 101, 101, 95,
311
- 101, 95, 101, 95, 94, 95, 94, 58, 94, 58,
312
- 94, 58, nil, 58 ]
225
+ 63, 63, 5, 56, 1, 56, 73, 127, 127, 73,
226
+ 14, 63, 63, 63, 9, 63, 9, 63, 127, 127,
227
+ 127, 5, 127, 5, 127, 16, 73, 63, 63, 63,
228
+ 63, 63, 151, 9, 127, 127, 127, 127, 127, 224,
229
+ 10, 17, 151, 151, 151, 89, 151, 89, 151, 224,
230
+ 224, 224, 134, 224, 134, 224, 37, 10, 151, 151,
231
+ 151, 151, 151, 18, 89, 224, 224, 224, 224, 224,
232
+ 0, 134, 0, 37, 38, 22, 54, 0, 23, 0,
233
+ 0, 0, 24, 0, 91, 0, 54, 0, 54, 0,
234
+ 54, 38, 0, 67, 67, 0, 0, 0, 0, 0,
235
+ 67, 91, 67, 67, 67, 52, 67, 52, 67, 52,
236
+ 51, 72, 72, 66, 72, 67, 59, 60, 67, 67,
237
+ 67, 67, 67, 33, 98, 66, 33, 66, 33, 33,
238
+ 33, 72, 33, 71, 33, 98, 92, 74, 92, 147,
239
+ 98, 33, 77, 78, 33, 33, 33, 33, 33, 34,
240
+ 214, 147, 34, 147, 34, 34, 34, 112, 34, 112,
241
+ 34, 112, 214, 113, 214, 79, 93, 34, 93, 88,
242
+ 34, 34, 34, 34, 34, 26, 90, 26, 26, 113,
243
+ 113, 26, 87, 26, 87, 87, 87, 121, 87, 121,
244
+ 87, 99, 107, 26, 26, 26, 26, 26, 161, 108,
245
+ 87, 87, 87, 87, 87, 153, 109, 153, 153, 153,
246
+ 124, 153, 124, 153, 161, 161, 157, 166, 157, 166,
247
+ 153, 115, 116, 153, 153, 153, 153, 153, 154, 123,
248
+ 154, 154, 154, 58, 154, 58, 154, 58, 94, 58,
249
+ 94, 128, 94, 154, 94, 129, 154, 154, 154, 154,
250
+ 154, 265, 132, 265, 265, 265, 167, 265, 167, 265,
251
+ 133, 12, 12, 12, 144, 12, 265, 12, 158, 265,
252
+ 265, 265, 265, 265, 160, 162, 163, 12, 12, 12,
253
+ 12, 12, 13, 13, 13, 169, 13, 178, 13, 36,
254
+ 36, 36, 189, 36, 202, 36, 213, 218, 13, 13,
255
+ 13, 13, 13, 220, 222, 36, 36, 36, 36, 36,
256
+ 62, 62, 62, 225, 62, 230, 62, 64, 64, 232,
257
+ 236, 64, 238, 64, 245, 253, 62, 62, 62, 62,
258
+ 62, 256, 257, 64, 64, 64, 64, 64, 68, 68,
259
+ 68, 260, 68, 264, 68, 69, 69, 267, 268, 69,
260
+ 271, 69, 273, 274, 68, 68, 68, 68, 68, 280,
261
+ 281, 69, 69, 69, 69, 69, 70, 70, 70, 283,
262
+ 70, 284, 70, 75, 75, 75, 285, 75, 288, 75,
263
+ 290, 292, 70, 70, 70, 70, 70, 293, 295, 75,
264
+ 75, 75, 75, 75, 103, 103, 103, 300, 103, 304,
265
+ 103, 104, 104, 104, 307, 104, 308, 104, 311, 312,
266
+ 103, 103, 103, 103, 103, 313, 316, 104, 104, 104,
267
+ 104, 104, 111, 111, nil, nil, 111, nil, 111, 117,
268
+ 117, nil, nil, 117, nil, 117, nil, nil, 111, 111,
269
+ 111, 111, 111, nil, nil, 117, 117, 117, 117, 117,
270
+ 118, 118, 118, nil, 118, nil, 118, 126, 126, 126,
271
+ nil, 126, nil, 126, nil, nil, 118, 118, 118, 118,
272
+ 118, nil, nil, 126, 126, 126, 126, 126, 130, 130,
273
+ 130, nil, 130, nil, 130, 143, 143, 143, nil, 143,
274
+ nil, 143, nil, nil, 130, 130, 130, 130, 130, nil,
275
+ nil, 143, 143, 143, 143, 143, 145, 145, 145, nil,
276
+ 145, nil, 145, 146, 146, nil, nil, 146, nil, 146,
277
+ nil, nil, 145, 145, 145, 145, 145, nil, nil, 146,
278
+ 146, 146, 146, 146, 148, 148, 148, nil, 148, nil,
279
+ 148, 149, 149, 149, nil, 149, nil, 149, nil, nil,
280
+ 148, 148, 148, 148, 148, nil, nil, 149, 149, 149,
281
+ 149, 149, 150, 150, 150, nil, 150, nil, 150, 205,
282
+ 205, 205, nil, 205, nil, 205, nil, nil, 150, 150,
283
+ 150, 150, 150, nil, nil, 205, 205, 205, 205, 205,
284
+ 215, 215, nil, nil, 215, nil, 215, 216, 216, 216,
285
+ nil, 216, nil, 216, nil, nil, 215, 215, 215, 215,
286
+ 215, nil, nil, 216, 216, 216, 216, 216, 217, 217,
287
+ 217, nil, 217, nil, 217, 240, 240, 240, nil, 240,
288
+ nil, 240, nil, nil, 217, 217, 217, 217, 217, nil,
289
+ nil, 240, 240, 240, 240, 240, 244, 244, 244, nil,
290
+ 244, nil, 244, 247, 247, 247, nil, 247, nil, 247,
291
+ nil, nil, 244, 244, 244, 244, 244, nil, nil, 247,
292
+ 247, 247, 247, 247, 249, 249, 249, nil, 249, nil,
293
+ 249, 250, 250, 250, nil, 250, nil, 250, nil, nil,
294
+ 249, 249, 249, 249, 249, nil, nil, 250, 250, 250,
295
+ 250, 250, 251, 251, 251, nil, 251, nil, 251, 262,
296
+ 262, 262, nil, 262, nil, 262, nil, nil, 251, 251,
297
+ 251, 251, 251, nil, nil, 262, 262, 262, 262, 262,
298
+ 263, 263, 263, nil, 263, nil, 263, 310, 310, 310,
299
+ nil, 310, nil, 310, nil, nil, 263, 263, 263, 263,
300
+ 263, 57, nil, 310, 310, 310, 310, 310, 168, 168,
301
+ 168, 57, 168, 57, 168, 57, 212, 57, nil, 254,
302
+ nil, nil, nil, nil, 168, nil, 212, 261, 212, 254,
303
+ 212, 254, 212, 254, 95, 254, 95, 261, 95, 261,
304
+ 95, 261, nil, 261, 270, 270, 270, nil, 270, nil,
305
+ 270, 275, 275, 275, nil, 275, nil, 275, nil, nil,
306
+ 270, nil, 296, 296, 296, nil, 296, 275, 296, 297,
307
+ 297, 297, nil, 297, nil, 297, nil, nil, 296, nil,
308
+ 101, 101, 101, nil, 101, 297, 101, 110, 110, nil,
309
+ 125, 110, 125, 110, 125, 159, 125, 159, 190, 159,
310
+ 190, 159, 190, 191, 190, 191, 233, 191, 233, 191,
311
+ 233, 234, 233, 234, nil, 234, nil, 234, 239, 239,
312
+ 239, 255, 239, 255, 239, 255, nil, 255 ]
313
313
 
314
314
  racc_action_pointer = [
315
- 63, 389, nil, nil, nil, 0, nil, nil, nil, 40,
316
- 42, nil, 246, 659, 356, nil, 372, 310, 309, nil,
317
- nil, nil, 293, 304, 298, nil, 239, nil, nil, nil,
318
- nil, nil, nil, 138, 112, nil, 295, 74, 70, nil,
315
+ 63, 4, nil, nil, nil, 0, nil, nil, nil, 2,
316
+ 26, nil, 245, 266, -11, nil, 21, 18, 49, nil,
317
+ nil, nil, 54, 78, 82, nil, 161, nil, nil, nil,
318
+ nil, nil, nil, 112, 138, nil, 273, 42, 60, nil,
319
319
  nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
320
- nil, 297, 249, nil, 145, nil, 58, 746, 851, 272,
321
- 263, nil, 442, -5, 470, nil, 144, 86, 519, 526,
322
- 547, 266, 100, -5, 249, 603, nil, 233, 229, 219,
323
- nil, nil, nil, nil, nil, nil, nil, 207, 219, 33,
324
- 214, 26, 168, -15, 848, 843, nil, nil, 121, 216,
325
- nil, 840, nil, 386, 323, nil, nil, 216, 193, 164,
326
- 833, 414, 191, 60, nil, 157, 160, 715, 575, nil,
327
- nil, 89, nil, 123, 139, 807, 722, 2, 136, 128,
328
- 435, nil, 102, 104, 2, nil, nil, nil, nil, nil,
329
- nil, nil, nil, 407, 59, 379, 358, 185, 351, 330,
330
- 274, 33, nil, 161, 184, nil, nil, 118, 29, 808,
331
- 13, 154, 242, -20, nil, nil, 162, 119, 789, 60,
332
- nil, nil, nil, nil, nil, nil, nil, nil, 68, nil,
333
- nil, nil, nil, nil, nil, nil, nil, nil, nil, 74,
334
- 818, 192, nil, nil, nil, nil, nil, nil, nil, nil,
335
- nil, nil, 105, nil, nil, 491, nil, nil, nil, nil,
336
- nil, nil, 797, 129, 107, 687, 463, 302, 181, nil,
337
- 175, nil, 178, nil, 26, 187, nil, nil, nil, nil,
338
- 210, nil, 214, 800, 826, nil, 223, nil, 222, 815,
339
- 666, nil, nil, nil, 638, -11, nil, 631, nil, 610,
340
- 582, 554, nil, 258, 792, 823, 258, 263, nil, nil,
341
- 289, 779, 498, 267, 291, 216, nil, 286, 291, nil,
342
- 772, 310, nil, 311, 317, 761, nil, nil, nil, nil,
343
- 324, 338, nil, 337, 339, 341, nil, nil, 348, nil,
344
- 354, nil, 349, 358, nil, 354, 754, 743, nil, nil,
345
- 364, nil, nil, nil, 351, nil, nil, 352, 370, nil,
346
- 694, 380, 388, 393, nil, nil, 389, nil, nil, nil ]
320
+ nil, 110, 89, nil, 70, nil, -15, 745, 217, 102,
321
+ 103, nil, 294, -5, 301, nil, 107, 86, 322, 329,
322
+ 350, 129, 100, -5, 126, 357, nil, 117, 115, 137,
323
+ nil, nil, nil, nil, nil, nil, nil, 168, 142, 33,
324
+ 146, 70, 118, 148, 222, 768, nil, nil, 121, 176,
325
+ nil, 814, nil, 378, 385, nil, nil, 180, 193, 194,
326
+ 821, 406, 141, 149, nil, 209, 216, 413, 434, nil,
327
+ nil, 169, nil, 199, 192, 824, 441, 2, 235, 240,
328
+ 462, nil, 238, 254, 40, nil, nil, nil, nil, nil,
329
+ nil, nil, nil, 469, 260, 490, 497, 133, 518, 525,
330
+ 546, 26, nil, 191, 214, nil, nil, 198, 256, 829,
331
+ 262, 184, 263, 246, nil, nil, 199, 238, 742, 270,
332
+ nil, nil, nil, nil, nil, nil, nil, nil, 273, nil,
333
+ nil, nil, nil, nil, nil, nil, nil, nil, nil, 280,
334
+ 832, 837, nil, nil, nil, nil, nil, nil, nil, nil,
335
+ nil, nil, 282, nil, nil, 553, nil, nil, nil, nil,
336
+ nil, nil, 760, 282, 144, 574, 581, 602, 291, nil,
337
+ 289, nil, 290, nil, 33, 285, nil, nil, nil, nil,
338
+ 303, nil, 307, 840, 845, nil, 308, nil, 307, 852,
339
+ 609, nil, nil, nil, 630, 309, nil, 637, nil, 658,
340
+ 665, 686, nil, 307, 763, 855, 301, 302, nil, nil,
341
+ 335, 771, 693, 714, 329, 237, nil, 317, 318, nil,
342
+ 778, 335, nil, 337, 338, 785, nil, nil, nil, nil,
343
+ 341, 354, nil, 357, 359, 364, nil, nil, 372, nil,
344
+ 374, nil, 369, 375, nil, 370, 796, 803, nil, nil,
345
+ 382, nil, nil, nil, 369, nil, nil, 374, 388, nil,
346
+ 721, 390, 397, 403, nil, nil, 398, nil, nil, nil ]
347
347
 
348
348
  racc_action_default = [
349
349
  -176, -176, -1, -2, -3, -4, -5, -6, -7, -8,
@@ -381,16 +381,16 @@ racc_action_default = [
381
381
 
382
382
  racc_goto_table = [
383
383
  70, 179, 130, 13, 228, 11, 248, 115, 123, 226,
384
- 227, 113, 245, 5, 18, 9, 63, 11, 68, 10,
385
- 23, 132, 22, 24, 71, 15, 14, 59, 241, 241,
386
- 102, 60, 237, 243, 77, 88, 75, 75, 131, 309,
387
- 309, 299, 16, 70, 162, 163, 17, 160, 161, 242,
388
- 100, 89, 231, 135, 235, 91, 298, 99, 164, 98,
389
- 109, 143, 97, 27, 28, 126, 127, 144, 29, 30,
390
- 75, 142, 11, 145, 31, 204, 32, 174, 151, 203,
391
- 136, 18, 134, 61, 217, 185, 10, 137, 6, 140,
392
- 139, 174, 11, 138, 4, 225, 3, 2, 90, 105,
393
- 155, 1, 59, nil, nil, nil, 60, 176, 248, 230,
384
+ 227, 113, 245, 5, 14, 9, 63, 11, 68, 10,
385
+ 18, 132, 22, 23, 71, 1, 24, 59, 237, 243,
386
+ 2, 60, 309, 309, 241, 241, 75, 75, 131, 77,
387
+ 88, 3, 4, 70, 162, 163, 6, 160, 161, 61,
388
+ 97, 89, 231, 98, 235, 91, 164, 99, 298, 100,
389
+ 242, 143, 102, 299, 15, 126, 127, 144, 16, 17,
390
+ 75, 142, 11, 145, 135, 204, 109, 174, 151, 203,
391
+ 136, 138, 134, 27, 217, 185, 10, 18, 28, 140,
392
+ 137, 174, 11, 139, 29, 30, 31, 32, 225, 90,
393
+ 155, 105, 59, nil, nil, nil, 60, 176, 248, 230,
394
394
  nil, nil, nil, 248, 294, 228, nil, nil, nil, nil,
395
395
  131, 291, nil, nil, nil, nil, nil, nil, nil, 205,
396
396
  206, nil, nil, 211, 248, 248, nil, nil, nil, nil,
@@ -412,16 +412,16 @@ racc_goto_table = [
412
412
 
413
413
  racc_goto_check = [
414
414
  43, 45, 52, 23, 58, 11, 66, 26, 26, 57,
415
- 57, 24, 16, 5, 34, 9, 23, 11, 42, 10,
416
- 40, 24, 38, 41, 53, 31, 30, 9, 25, 25,
417
- 28, 10, 19, 19, 54, 54, 23, 23, 43, 22,
418
- 22, 29, 32, 43, 26, 26, 33, 24, 24, 20,
419
- 18, 9, 45, 39, 45, 10, 17, 15, 14, 13,
420
- 44, 42, 12, 46, 47, 23, 23, 53, 48, 49,
421
- 23, 23, 11, 23, 50, 26, 51, 43, 23, 24,
422
- 5, 34, 9, 7, 52, 43, 10, 40, 6, 38,
423
- 41, 43, 11, 30, 4, 56, 3, 2, 61, 65,
424
- 5, 1, 9, nil, nil, nil, 10, 23, 66, 26,
415
+ 57, 24, 16, 5, 30, 9, 23, 11, 42, 10,
416
+ 34, 24, 38, 40, 53, 1, 41, 9, 19, 19,
417
+ 2, 10, 22, 22, 25, 25, 23, 23, 43, 54,
418
+ 54, 3, 4, 43, 26, 26, 6, 24, 24, 7,
419
+ 12, 9, 45, 13, 45, 10, 14, 15, 17, 18,
420
+ 20, 42, 28, 29, 31, 23, 23, 53, 32, 33,
421
+ 23, 23, 11, 23, 39, 26, 44, 43, 23, 24,
422
+ 5, 30, 9, 46, 52, 43, 10, 34, 47, 38,
423
+ 40, 43, 11, 41, 48, 49, 50, 51, 56, 61,
424
+ 5, 65, 9, nil, nil, nil, 10, 23, 66, 26,
425
425
  nil, nil, nil, 66, 16, 58, nil, nil, nil, nil,
426
426
  43, 57, nil, nil, nil, nil, nil, nil, nil, 23,
427
427
  23, nil, nil, 23, 66, 66, nil, nil, nil, nil,
@@ -442,13 +442,13 @@ racc_goto_check = [
442
442
  nil, nil, nil, nil, 43 ]
443
443
 
444
444
  racc_goto_pointer = [
445
- nil, 101, 97, 96, 94, 13, 88, 71, nil, 15,
446
- 19, 5, 10, 7, -40, 5, -156, -219, -2, -134,
447
- -118, nil, -257, 3, -45, -138, -50, nil, -22, -234,
448
- 26, 25, 42, 46, 14, nil, nil, nil, 22, -14,
449
- 20, 23, -8, -26, 6, -108, 63, 64, 68, 69,
450
- 74, 76, -62, -2, 1, nil, -58, -144, -150, nil,
451
- nil, 62, nil, nil, nil, 47, -162, nil ]
445
+ nil, 25, 30, 41, 42, 13, 46, 37, nil, 15,
446
+ 19, 5, -2, 1, -42, 5, -156, -217, 7, -138,
447
+ -107, nil, -264, 3, -45, -132, -50, nil, 10, -212,
448
+ 14, 64, 68, 69, 20, nil, nil, nil, 22, 7,
449
+ 23, 26, -8, -26, 22, -108, 83, 88, 94, 95,
450
+ 96, 97, -62, -2, 6, nil, -55, -144, -150, nil,
451
+ nil, 63, nil, nil, nil, 49, -162, nil ]
452
452
 
453
453
  racc_goto_default = [
454
454
  nil, nil, nil, nil, nil, 84, nil, 7, 8, 72,
@@ -807,7 +807,7 @@ Racc_token_to_s_table = [
807
807
  "d01_29",
808
808
  "d01_30" ]
809
809
 
810
- Racc_debug_parser = true
810
+ Racc_debug_parser = false
811
811
 
812
812
  ##### State transition tables end #####
813
813
 
@@ -857,7 +857,8 @@ module_eval(<<'.,.,', 'parser.y', 32)
857
857
 
858
858
  module_eval(<<'.,.,', 'parser.y', 36)
859
859
  def _reduce_12(val, _values, result)
860
- result = DateTime.new(val[0].year, val[0].month, val[0].day, *val[2])
860
+ result = DateTime.new(val[0].year, val[0].month, val[0].day, *val[2])
861
+ result.skip_timezone = (val[2].length == 3)
861
862
 
862
863
  result
863
864
  end
@@ -865,14 +866,14 @@ module_eval(<<'.,.,', 'parser.y', 36)
865
866
 
866
867
  # reduce 13 omitted
867
868
 
868
- module_eval(<<'.,.,', 'parser.y', 40)
869
+ module_eval(<<'.,.,', 'parser.y', 41)
869
870
  def _reduce_14(val, _values, result)
870
871
  result = val.flatten
871
872
  result
872
873
  end
873
874
  .,.,
874
875
 
875
- module_eval(<<'.,.,', 'parser.y', 42)
876
+ module_eval(<<'.,.,', 'parser.y', 43)
876
877
  def _reduce_15(val, _values, result)
877
878
  result = val.values_at(0, 2, 4)
878
879
  result
@@ -881,28 +882,28 @@ module_eval(<<'.,.,', 'parser.y', 42)
881
882
 
882
883
  # reduce 16 omitted
883
884
 
884
- module_eval(<<'.,.,', 'parser.y', 45)
885
+ module_eval(<<'.,.,', 'parser.y', 46)
885
886
  def _reduce_17(val, _values, result)
886
887
  result = [24, 0, 0]
887
888
  result
888
889
  end
889
890
  .,.,
890
891
 
891
- module_eval(<<'.,.,', 'parser.y', 47)
892
+ module_eval(<<'.,.,', 'parser.y', 48)
892
893
  def _reduce_18(val, _values, result)
893
894
  result = 0
894
895
  result
895
896
  end
896
897
  .,.,
897
898
 
898
- module_eval(<<'.,.,', 'parser.y', 48)
899
+ module_eval(<<'.,.,', 'parser.y', 49)
899
900
  def _reduce_19(val, _values, result)
900
901
  result = -1 * val[1]
901
902
  result
902
903
  end
903
904
  .,.,
904
905
 
905
- module_eval(<<'.,.,', 'parser.y', 49)
906
+ module_eval(<<'.,.,', 'parser.y', 50)
906
907
  def _reduce_20(val, _values, result)
907
908
  result = val[1]
908
909
  result
@@ -911,35 +912,35 @@ module_eval(<<'.,.,', 'parser.y', 49)
911
912
 
912
913
  # reduce 21 omitted
913
914
 
914
- module_eval(<<'.,.,', 'parser.y', 53)
915
+ module_eval(<<'.,.,', 'parser.y', 54)
915
916
  def _reduce_22(val, _values, result)
916
917
  result = 0
917
918
  result
918
919
  end
919
920
  .,.,
920
921
 
921
- module_eval(<<'.,.,', 'parser.y', 57)
922
+ module_eval(<<'.,.,', 'parser.y', 58)
922
923
  def _reduce_23(val, _values, result)
923
924
  result = Rational(val[0] * 60 + val[2], 1440)
924
925
  result
925
926
  end
926
927
  .,.,
927
928
 
928
- module_eval(<<'.,.,', 'parser.y', 58)
929
+ module_eval(<<'.,.,', 'parser.y', 59)
929
930
  def _reduce_24(val, _values, result)
930
931
  result = Rational(840, 1440)
931
932
  result
932
933
  end
933
934
  .,.,
934
935
 
935
- module_eval(<<'.,.,', 'parser.y', 59)
936
+ module_eval(<<'.,.,', 'parser.y', 60)
936
937
  def _reduce_25(val, _values, result)
937
938
  result = Rational(val[3], 1440)
938
939
  result
939
940
  end
940
941
  .,.,
941
942
 
942
- module_eval(<<'.,.,', 'parser.y', 63)
943
+ module_eval(<<'.,.,', 'parser.y', 64)
943
944
  def _reduce_26(val, _values, result)
944
945
  result = val.zip([1000,100,10,1]).reduce(0) { |s,(a,b)| s += a * b }
945
946
 
@@ -951,14 +952,14 @@ module_eval(<<'.,.,', 'parser.y', 63)
951
952
 
952
953
  # reduce 28 omitted
953
954
 
954
- module_eval(<<'.,.,', 'parser.y', 69)
955
+ module_eval(<<'.,.,', 'parser.y', 70)
955
956
  def _reduce_29(val, _values, result)
956
957
  result = [val[0], val[2]]
957
958
  result
958
959
  end
959
960
  .,.,
960
961
 
961
- module_eval(<<'.,.,', 'parser.y', 76)
962
+ module_eval(<<'.,.,', 'parser.y', 77)
962
963
  def _reduce_30(val, _values, result)
963
964
  result = val[0] << val[2]
964
965
  if result[2] > 31 || (result[2] > 30 && [2,4,6,9,11].include?(result[1])) || (result[2] > 29 && result[1] == 2)
@@ -983,7 +984,7 @@ module_eval(<<'.,.,', 'parser.y', 76)
983
984
 
984
985
  # reduce 37 omitted
985
986
 
986
- module_eval(<<'.,.,', 'parser.y', 99)
987
+ module_eval(<<'.,.,', 'parser.y', 100)
987
988
  def _reduce_38(val, _values, result)
988
989
  result = Date.new(val[0][0]).year_precision!
989
990
  result.unspecified.year[2,2] = val[0][1]
@@ -998,7 +999,7 @@ module_eval(<<'.,.,', 'parser.y', 99)
998
999
 
999
1000
  # reduce 41 omitted
1000
1001
 
1001
- module_eval(<<'.,.,', 'parser.y', 110)
1002
+ module_eval(<<'.,.,', 'parser.y', 111)
1002
1003
  def _reduce_42(val, _values, result)
1003
1004
  result = [val[0,3].zip([1000,100,10]).reduce(0) { |s,(a,b)| s += a * b }, [false,true]]
1004
1005
 
@@ -1006,7 +1007,7 @@ module_eval(<<'.,.,', 'parser.y', 110)
1006
1007
  end
1007
1008
  .,.,
1008
1009
 
1009
- module_eval(<<'.,.,', 'parser.y', 114)
1010
+ module_eval(<<'.,.,', 'parser.y', 115)
1010
1011
  def _reduce_43(val, _values, result)
1011
1012
  result = [val[0,2].zip([1000,100]).reduce(0) { |s,(a,b)| s += a * b }, [true, true]]
1012
1013
 
@@ -1014,7 +1015,7 @@ module_eval(<<'.,.,', 'parser.y', 114)
1014
1015
  end
1015
1016
  .,.,
1016
1017
 
1017
- module_eval(<<'.,.,', 'parser.y', 118)
1018
+ module_eval(<<'.,.,', 'parser.y', 119)
1018
1019
  def _reduce_44(val, _values, result)
1019
1020
  result = Date.new(val[0]).unspecified!(:month)
1020
1021
  result.precision = :month
@@ -1023,7 +1024,7 @@ module_eval(<<'.,.,', 'parser.y', 118)
1023
1024
  end
1024
1025
  .,.,
1025
1026
 
1026
- module_eval(<<'.,.,', 'parser.y', 123)
1027
+ module_eval(<<'.,.,', 'parser.y', 124)
1027
1028
  def _reduce_45(val, _values, result)
1028
1029
  result = Date.new(*val[0]).unspecified!(:day)
1029
1030
 
@@ -1031,7 +1032,7 @@ module_eval(<<'.,.,', 'parser.y', 123)
1031
1032
  end
1032
1033
  .,.,
1033
1034
 
1034
- module_eval(<<'.,.,', 'parser.y', 127)
1035
+ module_eval(<<'.,.,', 'parser.y', 128)
1035
1036
  def _reduce_46(val, _values, result)
1036
1037
  result = Date.new(val[0]).unspecified!([:day,:month])
1037
1038
 
@@ -1039,7 +1040,7 @@ module_eval(<<'.,.,', 'parser.y', 127)
1039
1040
  end
1040
1041
  .,.,
1041
1042
 
1042
- module_eval(<<'.,.,', 'parser.y', 132)
1043
+ module_eval(<<'.,.,', 'parser.y', 133)
1043
1044
  def _reduce_47(val, _values, result)
1044
1045
  result = Interval.new(val[0], val[2])
1045
1046
 
@@ -1061,7 +1062,7 @@ module_eval(<<'.,.,', 'parser.y', 132)
1061
1062
 
1062
1063
  # reduce 54 omitted
1063
1064
 
1064
- module_eval(<<'.,.,', 'parser.y', 143)
1065
+ module_eval(<<'.,.,', 'parser.y', 144)
1065
1066
  def _reduce_55(val, _values, result)
1066
1067
  result = Date.new(val[1])
1067
1068
  result.precision = :year
@@ -1070,7 +1071,7 @@ module_eval(<<'.,.,', 'parser.y', 143)
1070
1071
  end
1071
1072
  .,.,
1072
1073
 
1073
- module_eval(<<'.,.,', 'parser.y', 148)
1074
+ module_eval(<<'.,.,', 'parser.y', 149)
1074
1075
  def _reduce_56(val, _values, result)
1075
1076
  result = Date.new(-1 * val[2])
1076
1077
  result.precision = :year
@@ -1079,7 +1080,7 @@ module_eval(<<'.,.,', 'parser.y', 148)
1079
1080
  end
1080
1081
  .,.,
1081
1082
 
1082
- module_eval(<<'.,.,', 'parser.y', 155)
1083
+ module_eval(<<'.,.,', 'parser.y', 156)
1083
1084
  def _reduce_57(val, _values, result)
1084
1085
  result = val.zip([10000,1000,100,10,1]).reduce(0) { |s,(a,b)| s += a * b }
1085
1086
 
@@ -1087,14 +1088,14 @@ module_eval(<<'.,.,', 'parser.y', 155)
1087
1088
  end
1088
1089
  .,.,
1089
1090
 
1090
- module_eval(<<'.,.,', 'parser.y', 157)
1091
+ module_eval(<<'.,.,', 'parser.y', 158)
1091
1092
  def _reduce_58(val, _values, result)
1092
1093
  result = 10 * val[0] + val[1]
1093
1094
  result
1094
1095
  end
1095
1096
  .,.,
1096
1097
 
1097
- module_eval(<<'.,.,', 'parser.y', 162)
1098
+ module_eval(<<'.,.,', 'parser.y', 163)
1098
1099
  def _reduce_59(val, _values, result)
1099
1100
  result = Season.new(val[0], val[2])
1100
1101
  val[3].each { |ua| result.send(ua) }
@@ -1103,28 +1104,28 @@ module_eval(<<'.,.,', 'parser.y', 162)
1103
1104
  end
1104
1105
  .,.,
1105
1106
 
1106
- module_eval(<<'.,.,', 'parser.y', 166)
1107
+ module_eval(<<'.,.,', 'parser.y', 167)
1107
1108
  def _reduce_60(val, _values, result)
1108
1109
  result = 21
1109
1110
  result
1110
1111
  end
1111
1112
  .,.,
1112
1113
 
1113
- module_eval(<<'.,.,', 'parser.y', 167)
1114
+ module_eval(<<'.,.,', 'parser.y', 168)
1114
1115
  def _reduce_61(val, _values, result)
1115
1116
  result = 22
1116
1117
  result
1117
1118
  end
1118
1119
  .,.,
1119
1120
 
1120
- module_eval(<<'.,.,', 'parser.y', 168)
1121
+ module_eval(<<'.,.,', 'parser.y', 169)
1121
1122
  def _reduce_62(val, _values, result)
1122
1123
  result = 23
1123
1124
  result
1124
1125
  end
1125
1126
  .,.,
1126
1127
 
1127
- module_eval(<<'.,.,', 'parser.y', 169)
1128
+ module_eval(<<'.,.,', 'parser.y', 170)
1128
1129
  def _reduce_63(val, _values, result)
1129
1130
  result = 24
1130
1131
  result
@@ -1147,14 +1148,14 @@ module_eval(<<'.,.,', 'parser.y', 169)
1147
1148
 
1148
1149
  # reduce 71 omitted
1149
1150
 
1150
- module_eval(<<'.,.,', 'parser.y', 187)
1151
+ module_eval(<<'.,.,', 'parser.y', 188)
1151
1152
  def _reduce_72(val, _values, result)
1152
1153
  result = val[0]; result.qualifier = val[1]
1153
1154
  result
1154
1155
  end
1155
1156
  .,.,
1156
1157
 
1157
- module_eval(<<'.,.,', 'parser.y', 193)
1158
+ module_eval(<<'.,.,', 'parser.y', 194)
1158
1159
  def _reduce_73(val, _values, result)
1159
1160
  result = Date.new(val[0].year * 10 ** val[2]).year_precision!
1160
1161
 
@@ -1162,7 +1163,7 @@ module_eval(<<'.,.,', 'parser.y', 193)
1162
1163
  end
1163
1164
  .,.,
1164
1165
 
1165
- module_eval(<<'.,.,', 'parser.y', 197)
1166
+ module_eval(<<'.,.,', 'parser.y', 198)
1166
1167
  def _reduce_74(val, _values, result)
1167
1168
  result = Date.new(val[1] * 10 ** val[3]).year_precision!
1168
1169
 
@@ -1170,7 +1171,7 @@ module_eval(<<'.,.,', 'parser.y', 197)
1170
1171
  end
1171
1172
  .,.,
1172
1173
 
1173
- module_eval(<<'.,.,', 'parser.y', 201)
1174
+ module_eval(<<'.,.,', 'parser.y', 202)
1174
1175
  def _reduce_75(val, _values, result)
1175
1176
  result = Date.new(-1 * val[2] * 10 ** val[4]).year_precision!
1176
1177
 
@@ -1178,14 +1179,14 @@ module_eval(<<'.,.,', 'parser.y', 201)
1178
1179
  end
1179
1180
  .,.,
1180
1181
 
1181
- module_eval(<<'.,.,', 'parser.y', 206)
1182
+ module_eval(<<'.,.,', 'parser.y', 207)
1182
1183
  def _reduce_76(val, _values, result)
1183
1184
  result = val[0]; result.calendar = val[1]
1184
1185
  result
1185
1186
  end
1186
1187
  .,.,
1187
1188
 
1188
- module_eval(<<'.,.,', 'parser.y', 212)
1189
+ module_eval(<<'.,.,', 'parser.y', 213)
1189
1190
  def _reduce_77(val, _values, result)
1190
1191
  d = val[0,3].zip([1000,100,10]).reduce(0) { |s,(a,b)| s += a * b }
1191
1192
  result = EDTF::Decade.new(d)
@@ -1194,7 +1195,7 @@ module_eval(<<'.,.,', 'parser.y', 212)
1194
1195
  end
1195
1196
  .,.,
1196
1197
 
1197
- module_eval(<<'.,.,', 'parser.y', 217)
1198
+ module_eval(<<'.,.,', 'parser.y', 218)
1198
1199
  def _reduce_78(val, _values, result)
1199
1200
  d = val[0,2].zip([1000,100]).reduce(0) { |s,(a,b)| s += a * b }
1200
1201
  result = EDTF::Century.new(d)
@@ -1203,77 +1204,77 @@ module_eval(<<'.,.,', 'parser.y', 217)
1203
1204
  end
1204
1205
  .,.,
1205
1206
 
1206
- module_eval(<<'.,.,', 'parser.y', 223)
1207
+ module_eval(<<'.,.,', 'parser.y', 224)
1207
1208
  def _reduce_79(val, _values, result)
1208
1209
  result = val[1].choice!
1209
1210
  result
1210
1211
  end
1211
1212
  .,.,
1212
1213
 
1213
- module_eval(<<'.,.,', 'parser.y', 225)
1214
+ module_eval(<<'.,.,', 'parser.y', 226)
1214
1215
  def _reduce_80(val, _values, result)
1215
1216
  result = val[1]
1216
1217
  result
1217
1218
  end
1218
1219
  .,.,
1219
1220
 
1220
- module_eval(<<'.,.,', 'parser.y', 227)
1221
+ module_eval(<<'.,.,', 'parser.y', 228)
1221
1222
  def _reduce_81(val, _values, result)
1222
1223
  result = EDTF::Set.new(val[0]).earlier!
1223
1224
  result
1224
1225
  end
1225
1226
  .,.,
1226
1227
 
1227
- module_eval(<<'.,.,', 'parser.y', 228)
1228
+ module_eval(<<'.,.,', 'parser.y', 229)
1228
1229
  def _reduce_82(val, _values, result)
1229
1230
  result = EDTF::Set.new([val[0]] + val[2] + [val[4]]).earlier!.later!
1230
1231
  result
1231
1232
  end
1232
1233
  .,.,
1233
1234
 
1234
- module_eval(<<'.,.,', 'parser.y', 229)
1235
+ module_eval(<<'.,.,', 'parser.y', 230)
1235
1236
  def _reduce_83(val, _values, result)
1236
1237
  result = EDTF::Set.new([val[0]] + val[2]).earlier!
1237
1238
  result
1238
1239
  end
1239
1240
  .,.,
1240
1241
 
1241
- module_eval(<<'.,.,', 'parser.y', 230)
1242
+ module_eval(<<'.,.,', 'parser.y', 231)
1242
1243
  def _reduce_84(val, _values, result)
1243
1244
  result = EDTF::Set.new([val[0]] + [val[2]]).earlier!.later!
1244
1245
  result
1245
1246
  end
1246
1247
  .,.,
1247
1248
 
1248
- module_eval(<<'.,.,', 'parser.y', 231)
1249
+ module_eval(<<'.,.,', 'parser.y', 232)
1249
1250
  def _reduce_85(val, _values, result)
1250
1251
  result = EDTF::Set.new(val[0] + [val[2]]).later!
1251
1252
  result
1252
1253
  end
1253
1254
  .,.,
1254
1255
 
1255
- module_eval(<<'.,.,', 'parser.y', 232)
1256
+ module_eval(<<'.,.,', 'parser.y', 233)
1256
1257
  def _reduce_86(val, _values, result)
1257
1258
  result = EDTF::Set.new(*val[0])
1258
1259
  result
1259
1260
  end
1260
1261
  .,.,
1261
1262
 
1262
- module_eval(<<'.,.,', 'parser.y', 233)
1263
+ module_eval(<<'.,.,', 'parser.y', 234)
1263
1264
  def _reduce_87(val, _values, result)
1264
1265
  result = EDTF::Set.new(val[0]).later!
1265
1266
  result
1266
1267
  end
1267
1268
  .,.,
1268
1269
 
1269
- module_eval(<<'.,.,', 'parser.y', 236)
1270
+ module_eval(<<'.,.,', 'parser.y', 237)
1270
1271
  def _reduce_88(val, _values, result)
1271
1272
  result = [val[0]].flatten
1272
1273
  result
1273
1274
  end
1274
1275
  .,.,
1275
1276
 
1276
- module_eval(<<'.,.,', 'parser.y', 237)
1277
+ module_eval(<<'.,.,', 'parser.y', 238)
1277
1278
  def _reduce_89(val, _values, result)
1278
1279
  result = val[0] + [val[2]].flatten
1279
1280
  result
@@ -1290,56 +1291,56 @@ module_eval(<<'.,.,', 'parser.y', 237)
1290
1291
 
1291
1292
  # reduce 94 omitted
1292
1293
 
1293
- module_eval(<<'.,.,', 'parser.y', 249)
1294
+ module_eval(<<'.,.,', 'parser.y', 250)
1294
1295
  def _reduce_95(val, _values, result)
1295
1296
  result = val[1]
1296
1297
  result
1297
1298
  end
1298
1299
  .,.,
1299
1300
 
1300
- module_eval(<<'.,.,', 'parser.y', 251)
1301
+ module_eval(<<'.,.,', 'parser.y', 252)
1301
1302
  def _reduce_96(val, _values, result)
1302
1303
  result = Date.new(*val[0]).year_precision!
1303
1304
  result
1304
1305
  end
1305
1306
  .,.,
1306
1307
 
1307
- module_eval(<<'.,.,', 'parser.y', 252)
1308
+ module_eval(<<'.,.,', 'parser.y', 253)
1308
1309
  def _reduce_97(val, _values, result)
1309
1310
  result = Date.new(*val[0]).month_precision!
1310
1311
  result
1311
1312
  end
1312
1313
  .,.,
1313
1314
 
1314
- module_eval(<<'.,.,', 'parser.y', 253)
1315
+ module_eval(<<'.,.,', 'parser.y', 254)
1315
1316
  def _reduce_98(val, _values, result)
1316
1317
  result = Date.new(val[0]).year_precision!
1317
1318
  result
1318
1319
  end
1319
1320
  .,.,
1320
1321
 
1321
- module_eval(<<'.,.,', 'parser.y', 256)
1322
+ module_eval(<<'.,.,', 'parser.y', 257)
1322
1323
  def _reduce_99(val, _values, result)
1323
1324
  result = (Date.new(val[0]).day_precision! .. Date.new(val[2]).day_precision!)
1324
1325
  result
1325
1326
  end
1326
1327
  .,.,
1327
1328
 
1328
- module_eval(<<'.,.,', 'parser.y', 257)
1329
+ module_eval(<<'.,.,', 'parser.y', 258)
1329
1330
  def _reduce_100(val, _values, result)
1330
1331
  result = (Date.new(val[0]).month_precision! .. Date.new(val[2]).month_precision!)
1331
1332
  result
1332
1333
  end
1333
1334
  .,.,
1334
1335
 
1335
- module_eval(<<'.,.,', 'parser.y', 258)
1336
+ module_eval(<<'.,.,', 'parser.y', 259)
1336
1337
  def _reduce_101(val, _values, result)
1337
1338
  result = (Date.new(val[0]).year_precision! .. Date.new(val[2]).year_precision!)
1338
1339
  result
1339
1340
  end
1340
1341
  .,.,
1341
1342
 
1342
- module_eval(<<'.,.,', 'parser.y', 264)
1343
+ module_eval(<<'.,.,', 'parser.y', 265)
1343
1344
  def _reduce_102(val, _values, result)
1344
1345
  result = Date.new(val[0][0], val[2], val[4])
1345
1346
  result.unspecified.year[2,2] = val[0][1]
@@ -1348,7 +1349,7 @@ module_eval(<<'.,.,', 'parser.y', 264)
1348
1349
  end
1349
1350
  .,.,
1350
1351
 
1351
- module_eval(<<'.,.,', 'parser.y', 269)
1352
+ module_eval(<<'.,.,', 'parser.y', 270)
1352
1353
  def _reduce_103(val, _values, result)
1353
1354
  result = Date.new(val[0][0], 1, val[5])
1354
1355
  result.unspecified.year[2,2] = val[0][1]
@@ -1358,7 +1359,7 @@ module_eval(<<'.,.,', 'parser.y', 269)
1358
1359
  end
1359
1360
  .,.,
1360
1361
 
1361
- module_eval(<<'.,.,', 'parser.y', 275)
1362
+ module_eval(<<'.,.,', 'parser.y', 276)
1362
1363
  def _reduce_104(val, _values, result)
1363
1364
  result = Date.new(val[0][0], 1, 1)
1364
1365
  result.unspecified.year[2,2] = val[0][1]
@@ -1368,7 +1369,7 @@ module_eval(<<'.,.,', 'parser.y', 275)
1368
1369
  end
1369
1370
  .,.,
1370
1371
 
1371
- module_eval(<<'.,.,', 'parser.y', 281)
1372
+ module_eval(<<'.,.,', 'parser.y', 282)
1372
1373
  def _reduce_105(val, _values, result)
1373
1374
  result = Date.new(val[0][0], val[2], 1)
1374
1375
  result.unspecified.year[2,2] = val[0][1]
@@ -1378,7 +1379,7 @@ module_eval(<<'.,.,', 'parser.y', 281)
1378
1379
  end
1379
1380
  .,.,
1380
1381
 
1381
- module_eval(<<'.,.,', 'parser.y', 287)
1382
+ module_eval(<<'.,.,', 'parser.y', 288)
1382
1383
  def _reduce_106(val, _values, result)
1383
1384
  result = Date.new(val[0], 1, val[5])
1384
1385
  result.unspecified!(:month)
@@ -1389,42 +1390,42 @@ module_eval(<<'.,.,', 'parser.y', 287)
1389
1390
 
1390
1391
  # reduce 107 omitted
1391
1392
 
1392
- module_eval(<<'.,.,', 'parser.y', 294)
1393
+ module_eval(<<'.,.,', 'parser.y', 295)
1393
1394
  def _reduce_108(val, _values, result)
1394
1395
  result = uoa(val[1], val[3])
1395
1396
  result
1396
1397
  end
1397
1398
  .,.,
1398
1399
 
1399
- module_eval(<<'.,.,', 'parser.y', 297)
1400
+ module_eval(<<'.,.,', 'parser.y', 298)
1400
1401
  def _reduce_109(val, _values, result)
1401
1402
  result = val[0].year_precision!
1402
1403
  result
1403
1404
  end
1404
1405
  .,.,
1405
1406
 
1406
- module_eval(<<'.,.,', 'parser.y', 298)
1407
+ module_eval(<<'.,.,', 'parser.y', 299)
1407
1408
  def _reduce_110(val, _values, result)
1408
1409
  result = val[0][0].month_precision!
1409
1410
  result
1410
1411
  end
1411
1412
  .,.,
1412
1413
 
1413
- module_eval(<<'.,.,', 'parser.y', 299)
1414
+ module_eval(<<'.,.,', 'parser.y', 300)
1414
1415
  def _reduce_111(val, _values, result)
1415
1416
  result = val[0].day_precision!
1416
1417
  result
1417
1418
  end
1418
1419
  .,.,
1419
1420
 
1420
- module_eval(<<'.,.,', 'parser.y', 301)
1421
+ module_eval(<<'.,.,', 'parser.y', 302)
1421
1422
  def _reduce_112(val, _values, result)
1422
1423
  result = uoa(Date.new(val[0]), val[1], :year)
1423
1424
  result
1424
1425
  end
1425
1426
  .,.,
1426
1427
 
1427
- module_eval(<<'.,.,', 'parser.y', 305)
1428
+ module_eval(<<'.,.,', 'parser.y', 306)
1428
1429
  def _reduce_113(val, _values, result)
1429
1430
  result = [uoa(val[0].change(:month => val[2]), val[3], [:month, :year])]
1430
1431
 
@@ -1432,7 +1433,7 @@ module_eval(<<'.,.,', 'parser.y', 305)
1432
1433
  end
1433
1434
  .,.,
1434
1435
 
1435
- module_eval(<<'.,.,', 'parser.y', 308)
1436
+ module_eval(<<'.,.,', 'parser.y', 309)
1436
1437
  def _reduce_114(val, _values, result)
1437
1438
  result = [uoa(Date.new(val[0], val[2]), val[3], [:year, :month])]
1438
1439
 
@@ -1440,7 +1441,7 @@ module_eval(<<'.,.,', 'parser.y', 308)
1440
1441
  end
1441
1442
  .,.,
1442
1443
 
1443
- module_eval(<<'.,.,', 'parser.y', 311)
1444
+ module_eval(<<'.,.,', 'parser.y', 312)
1444
1445
  def _reduce_115(val, _values, result)
1445
1446
  result = [uoa(Date.new(val[0], val[2]), val[4], [:month]), true]
1446
1447
 
@@ -1448,7 +1449,7 @@ module_eval(<<'.,.,', 'parser.y', 311)
1448
1449
  end
1449
1450
  .,.,
1450
1451
 
1451
- module_eval(<<'.,.,', 'parser.y', 314)
1452
+ module_eval(<<'.,.,', 'parser.y', 315)
1452
1453
  def _reduce_116(val, _values, result)
1453
1454
  result = [uoa(val[0].change(:month => val[2]), val[4], [:month]), true]
1454
1455
 
@@ -1456,7 +1457,7 @@ module_eval(<<'.,.,', 'parser.y', 314)
1456
1457
  end
1457
1458
  .,.,
1458
1459
 
1459
- module_eval(<<'.,.,', 'parser.y', 320)
1460
+ module_eval(<<'.,.,', 'parser.y', 321)
1460
1461
  def _reduce_117(val, _values, result)
1461
1462
  result = uoa(val[0][0].change(:day => val[2]), val[3], val[0][1] ? [:day] : nil)
1462
1463
 
@@ -1464,7 +1465,7 @@ module_eval(<<'.,.,', 'parser.y', 320)
1464
1465
  end
1465
1466
  .,.,
1466
1467
 
1467
- module_eval(<<'.,.,', 'parser.y', 323)
1468
+ module_eval(<<'.,.,', 'parser.y', 324)
1468
1469
  def _reduce_118(val, _values, result)
1469
1470
  result = uoa(val[0][0].change(:day => val[2]), val[4], [:day])
1470
1471
 
@@ -1472,7 +1473,7 @@ module_eval(<<'.,.,', 'parser.y', 323)
1472
1473
  end
1473
1474
  .,.,
1474
1475
 
1475
- module_eval(<<'.,.,', 'parser.y', 326)
1476
+ module_eval(<<'.,.,', 'parser.y', 327)
1476
1477
  def _reduce_119(val, _values, result)
1477
1478
  result = uoa(uoa(Date.new(val[0], val[2], val[5]), val[4], :month), val[6], :day)
1478
1479
 
@@ -1480,7 +1481,7 @@ module_eval(<<'.,.,', 'parser.y', 326)
1480
1481
  end
1481
1482
  .,.,
1482
1483
 
1483
- module_eval(<<'.,.,', 'parser.y', 329)
1484
+ module_eval(<<'.,.,', 'parser.y', 330)
1484
1485
  def _reduce_120(val, _values, result)
1485
1486
  result = uoa(Date.new(val[0][0], val[0][1], val[2]), val[3])
1486
1487
 
@@ -1488,7 +1489,7 @@ module_eval(<<'.,.,', 'parser.y', 329)
1488
1489
  end
1489
1490
  .,.,
1490
1491
 
1491
- module_eval(<<'.,.,', 'parser.y', 332)
1492
+ module_eval(<<'.,.,', 'parser.y', 333)
1492
1493
  def _reduce_121(val, _values, result)
1493
1494
  result = uoa(Date.new(val[0][0], val[0][1], val[2]), val[4], [:day])
1494
1495
 
@@ -1496,7 +1497,7 @@ module_eval(<<'.,.,', 'parser.y', 332)
1496
1497
  end
1497
1498
  .,.,
1498
1499
 
1499
- module_eval(<<'.,.,', 'parser.y', 335)
1500
+ module_eval(<<'.,.,', 'parser.y', 336)
1500
1501
  def _reduce_122(val, _values, result)
1501
1502
  result = uoa(Date.new(val[0], val[2], val[4]), val[6], [:month, :day])
1502
1503
 
@@ -1504,7 +1505,7 @@ module_eval(<<'.,.,', 'parser.y', 335)
1504
1505
  end
1505
1506
  .,.,
1506
1507
 
1507
- module_eval(<<'.,.,', 'parser.y', 338)
1508
+ module_eval(<<'.,.,', 'parser.y', 339)
1508
1509
  def _reduce_123(val, _values, result)
1509
1510
  result = Date.new(val[0], val[2], val[4])
1510
1511
  result = uoa(result, val[6], [:day])
@@ -1514,7 +1515,7 @@ module_eval(<<'.,.,', 'parser.y', 338)
1514
1515
  end
1515
1516
  .,.,
1516
1517
 
1517
- module_eval(<<'.,.,', 'parser.y', 343)
1518
+ module_eval(<<'.,.,', 'parser.y', 344)
1518
1519
  def _reduce_124(val, _values, result)
1519
1520
  result = val[0].change(:month => val[2], :day => val[4])
1520
1521
  result = uoa(result, val[6], [:month, :day])
@@ -1523,7 +1524,7 @@ module_eval(<<'.,.,', 'parser.y', 343)
1523
1524
  end
1524
1525
  .,.,
1525
1526
 
1526
- module_eval(<<'.,.,', 'parser.y', 347)
1527
+ module_eval(<<'.,.,', 'parser.y', 348)
1527
1528
  def _reduce_125(val, _values, result)
1528
1529
  result = val[0].change(:month => val[2], :day => val[4])
1529
1530
  result = uoa(result, val[6], [:day])
@@ -1533,7 +1534,7 @@ module_eval(<<'.,.,', 'parser.y', 347)
1533
1534
  end
1534
1535
  .,.,
1535
1536
 
1536
- module_eval(<<'.,.,', 'parser.y', 358)
1537
+ module_eval(<<'.,.,', 'parser.y', 359)
1537
1538
  def _reduce_126(val, _values, result)
1538
1539
  result = []
1539
1540
  result
@@ -1542,7 +1543,7 @@ module_eval(<<'.,.,', 'parser.y', 358)
1542
1543
 
1543
1544
  # reduce 127 omitted
1544
1545
 
1545
- module_eval(<<'.,.,', 'parser.y', 362)
1546
+ module_eval(<<'.,.,', 'parser.y', 363)
1546
1547
  def _reduce_128(val, _values, result)
1547
1548
  result = 0
1548
1549
  result
@@ -1569,28 +1570,28 @@ module_eval(<<'.,.,', 'parser.y', 362)
1569
1570
 
1570
1571
  # reduce 138 omitted
1571
1572
 
1572
- module_eval(<<'.,.,', 'parser.y', 368)
1573
+ module_eval(<<'.,.,', 'parser.y', 369)
1573
1574
  def _reduce_139(val, _values, result)
1574
1575
  result = val[1]
1575
1576
  result
1576
1577
  end
1577
1578
  .,.,
1578
1579
 
1579
- module_eval(<<'.,.,', 'parser.y', 369)
1580
+ module_eval(<<'.,.,', 'parser.y', 370)
1580
1581
  def _reduce_140(val, _values, result)
1581
1582
  result = 10
1582
1583
  result
1583
1584
  end
1584
1585
  .,.,
1585
1586
 
1586
- module_eval(<<'.,.,', 'parser.y', 370)
1587
+ module_eval(<<'.,.,', 'parser.y', 371)
1587
1588
  def _reduce_141(val, _values, result)
1588
1589
  result = 11
1589
1590
  result
1590
1591
  end
1591
1592
  .,.,
1592
1593
 
1593
- module_eval(<<'.,.,', 'parser.y', 371)
1594
+ module_eval(<<'.,.,', 'parser.y', 372)
1594
1595
  def _reduce_142(val, _values, result)
1595
1596
  result = 12
1596
1597
  result
@@ -1599,49 +1600,49 @@ module_eval(<<'.,.,', 'parser.y', 371)
1599
1600
 
1600
1601
  # reduce 143 omitted
1601
1602
 
1602
- module_eval(<<'.,.,', 'parser.y', 375)
1603
+ module_eval(<<'.,.,', 'parser.y', 376)
1603
1604
  def _reduce_144(val, _values, result)
1604
1605
  result = 13
1605
1606
  result
1606
1607
  end
1607
1608
  .,.,
1608
1609
 
1609
- module_eval(<<'.,.,', 'parser.y', 378)
1610
+ module_eval(<<'.,.,', 'parser.y', 379)
1610
1611
  def _reduce_145(val, _values, result)
1611
1612
  result = val[1]
1612
1613
  result
1613
1614
  end
1614
1615
  .,.,
1615
1616
 
1616
- module_eval(<<'.,.,', 'parser.y', 379)
1617
+ module_eval(<<'.,.,', 'parser.y', 380)
1617
1618
  def _reduce_146(val, _values, result)
1618
1619
  result = 10 + val[1]
1619
1620
  result
1620
1621
  end
1621
1622
  .,.,
1622
1623
 
1623
- module_eval(<<'.,.,', 'parser.y', 380)
1624
+ module_eval(<<'.,.,', 'parser.y', 381)
1624
1625
  def _reduce_147(val, _values, result)
1625
1626
  result = 20
1626
1627
  result
1627
1628
  end
1628
1629
  .,.,
1629
1630
 
1630
- module_eval(<<'.,.,', 'parser.y', 381)
1631
+ module_eval(<<'.,.,', 'parser.y', 382)
1631
1632
  def _reduce_148(val, _values, result)
1632
1633
  result = 21
1633
1634
  result
1634
1635
  end
1635
1636
  .,.,
1636
1637
 
1637
- module_eval(<<'.,.,', 'parser.y', 382)
1638
+ module_eval(<<'.,.,', 'parser.y', 383)
1638
1639
  def _reduce_149(val, _values, result)
1639
1640
  result = 22
1640
1641
  result
1641
1642
  end
1642
1643
  .,.,
1643
1644
 
1644
- module_eval(<<'.,.,', 'parser.y', 383)
1645
+ module_eval(<<'.,.,', 'parser.y', 384)
1645
1646
  def _reduce_150(val, _values, result)
1646
1647
  result = 23
1647
1648
  result
@@ -1654,42 +1655,42 @@ module_eval(<<'.,.,', 'parser.y', 383)
1654
1655
 
1655
1656
  # reduce 153 omitted
1656
1657
 
1657
- module_eval(<<'.,.,', 'parser.y', 391)
1658
+ module_eval(<<'.,.,', 'parser.y', 392)
1658
1659
  def _reduce_154(val, _values, result)
1659
1660
  result = 24
1660
1661
  result
1661
1662
  end
1662
1663
  .,.,
1663
1664
 
1664
- module_eval(<<'.,.,', 'parser.y', 392)
1665
+ module_eval(<<'.,.,', 'parser.y', 393)
1665
1666
  def _reduce_155(val, _values, result)
1666
1667
  result = 25
1667
1668
  result
1668
1669
  end
1669
1670
  .,.,
1670
1671
 
1671
- module_eval(<<'.,.,', 'parser.y', 393)
1672
+ module_eval(<<'.,.,', 'parser.y', 394)
1672
1673
  def _reduce_156(val, _values, result)
1673
1674
  result = 26
1674
1675
  result
1675
1676
  end
1676
1677
  .,.,
1677
1678
 
1678
- module_eval(<<'.,.,', 'parser.y', 394)
1679
+ module_eval(<<'.,.,', 'parser.y', 395)
1679
1680
  def _reduce_157(val, _values, result)
1680
1681
  result = 27
1681
1682
  result
1682
1683
  end
1683
1684
  .,.,
1684
1685
 
1685
- module_eval(<<'.,.,', 'parser.y', 395)
1686
+ module_eval(<<'.,.,', 'parser.y', 396)
1686
1687
  def _reduce_158(val, _values, result)
1687
1688
  result = 28
1688
1689
  result
1689
1690
  end
1690
1691
  .,.,
1691
1692
 
1692
- module_eval(<<'.,.,', 'parser.y', 396)
1693
+ module_eval(<<'.,.,', 'parser.y', 397)
1693
1694
  def _reduce_159(val, _values, result)
1694
1695
  result = 29
1695
1696
  result
@@ -1698,7 +1699,7 @@ module_eval(<<'.,.,', 'parser.y', 396)
1698
1699
 
1699
1700
  # reduce 160 omitted
1700
1701
 
1701
- module_eval(<<'.,.,', 'parser.y', 400)
1702
+ module_eval(<<'.,.,', 'parser.y', 401)
1702
1703
  def _reduce_161(val, _values, result)
1703
1704
  result = 30
1704
1705
  result
@@ -1707,7 +1708,7 @@ module_eval(<<'.,.,', 'parser.y', 400)
1707
1708
 
1708
1709
  # reduce 162 omitted
1709
1710
 
1710
- module_eval(<<'.,.,', 'parser.y', 404)
1711
+ module_eval(<<'.,.,', 'parser.y', 405)
1711
1712
  def _reduce_163(val, _values, result)
1712
1713
  result = 31
1713
1714
  result
@@ -1716,21 +1717,21 @@ module_eval(<<'.,.,', 'parser.y', 404)
1716
1717
 
1717
1718
  # reduce 164 omitted
1718
1719
 
1719
- module_eval(<<'.,.,', 'parser.y', 408)
1720
+ module_eval(<<'.,.,', 'parser.y', 409)
1720
1721
  def _reduce_165(val, _values, result)
1721
1722
  result = 30 + val[1]
1722
1723
  result
1723
1724
  end
1724
1725
  .,.,
1725
1726
 
1726
- module_eval(<<'.,.,', 'parser.y', 409)
1727
+ module_eval(<<'.,.,', 'parser.y', 410)
1727
1728
  def _reduce_166(val, _values, result)
1728
1729
  result = 40 + val[1]
1729
1730
  result
1730
1731
  end
1731
1732
  .,.,
1732
1733
 
1733
- module_eval(<<'.,.,', 'parser.y', 410)
1734
+ module_eval(<<'.,.,', 'parser.y', 411)
1734
1735
  def _reduce_167(val, _values, result)
1735
1736
  result = 50 + val[1]
1736
1737
  result
@@ -1741,21 +1742,21 @@ module_eval(<<'.,.,', 'parser.y', 410)
1741
1742
 
1742
1743
  # reduce 169 omitted
1743
1744
 
1744
- module_eval(<<'.,.,', 'parser.y', 417)
1745
+ module_eval(<<'.,.,', 'parser.y', 418)
1745
1746
  def _reduce_170(val, _values, result)
1746
1747
  result = val[0]
1747
1748
  result
1748
1749
  end
1749
1750
  .,.,
1750
1751
 
1751
- module_eval(<<'.,.,', 'parser.y', 418)
1752
+ module_eval(<<'.,.,', 'parser.y', 419)
1752
1753
  def _reduce_171(val, _values, result)
1753
1754
  result = 10 * val[0] + val[1]
1754
1755
  result
1755
1756
  end
1756
1757
  .,.,
1757
1758
 
1758
- module_eval(<<'.,.,', 'parser.y', 421)
1759
+ module_eval(<<'.,.,', 'parser.y', 422)
1759
1760
  def _reduce_172(val, _values, result)
1760
1761
  result = val.zip([100,10,1]).reduce(0) { |s,(a,b)| s += a * b }
1761
1762
 
@@ -1763,7 +1764,7 @@ module_eval(<<'.,.,', 'parser.y', 421)
1763
1764
  end
1764
1765
  .,.,
1765
1766
 
1766
- module_eval(<<'.,.,', 'parser.y', 425)
1767
+ module_eval(<<'.,.,', 'parser.y', 426)
1767
1768
  def _reduce_173(val, _values, result)
1768
1769
  result = val.zip([1000,100,10,1]).reduce(0) { |s,(a,b)| s += a * b }
1769
1770
 
@@ -1771,14 +1772,14 @@ module_eval(<<'.,.,', 'parser.y', 425)
1771
1772
  end
1772
1773
  .,.,
1773
1774
 
1774
- module_eval(<<'.,.,', 'parser.y', 429)
1775
+ module_eval(<<'.,.,', 'parser.y', 430)
1775
1776
  def _reduce_174(val, _values, result)
1776
1777
  result = val[0]
1777
1778
  result
1778
1779
  end
1779
1780
  .,.,
1780
1781
 
1781
- module_eval(<<'.,.,', 'parser.y', 430)
1782
+ module_eval(<<'.,.,', 'parser.y', 431)
1782
1783
  def _reduce_175(val, _values, result)
1783
1784
  result = 10 * val[0] + val[1]
1784
1785
  result