@malloydata/malloy-filter 0.0.422 → 0.0.423

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 (28) hide show
  1. package/dist/boolean_filter_expression.js +4 -1
  2. package/dist/boolean_filter_expression.js.map +1 -1
  3. package/dist/clause_utils.js +4 -1
  4. package/dist/clause_utils.js.map +1 -1
  5. package/dist/filter_interface.d.ts +6 -4
  6. package/dist/filter_interface.js +4 -1
  7. package/dist/filter_interface.js.map +1 -1
  8. package/dist/lib/fexpr_number_parser.js +283 -231
  9. package/dist/lib/fexpr_number_parser.js.map +1 -1
  10. package/dist/lib/ftemporal_parser.js +305 -253
  11. package/dist/lib/ftemporal_parser.js.map +1 -1
  12. package/dist/number_filter_expression.js +3 -0
  13. package/dist/number_filter_expression.js.map +1 -1
  14. package/dist/string_filter_expression.js +2 -0
  15. package/dist/string_filter_expression.js.map +1 -1
  16. package/dist/temporal_filter_expression.js +3 -1
  17. package/dist/temporal_filter_expression.js.map +1 -1
  18. package/package.json +1 -1
  19. package/src/boolean_filter_expression.ts +3 -1
  20. package/src/clause_utils.ts +4 -1
  21. package/src/filter_interface.ts +13 -2
  22. package/src/grammars/fexpr_number.peggy +2 -0
  23. package/src/grammars/ftemporal.peggy +2 -0
  24. package/src/lib/fexpr_number_parser.js +252 -203
  25. package/src/lib/ftemporal_parser.js +291 -242
  26. package/src/number_filter_expression.ts +3 -0
  27. package/src/string_filter_expression.ts +2 -0
  28. package/src/temporal_filter_expression.ts +6 -1
package/dist/lib/ftemporal_parser.js CHANGED
@@ -167,30 +167,31 @@ function peg$parse(input, options) {
167
167
  var peg$c12 = ":";
168
168
  var peg$c13 = "not";
169
169
  var peg$c14 = "null";
170
- var peg$c15 = "to";
171
- var peg$c16 = "now";
172
- var peg$c17 = "last";
173
- var peg$c18 = "this";
174
- var peg$c19 = "next";
175
- var peg$c20 = "ago";
176
- var peg$c21 = "from";
177
- var peg$c22 = "before";
178
- var peg$c23 = "after";
179
- var peg$c24 = "through";
180
- var peg$c25 = "starting";
181
- var peg$c26 = "for";
182
- var peg$c27 = "today";
183
- var peg$c28 = "yesterday";
184
- var peg$c29 = "tomorrow";
185
- var peg$c30 = "and";
186
- var peg$c31 = "or";
187
- var peg$c32 = "monday";
188
- var peg$c33 = "tuesday";
189
- var peg$c34 = "wednesday";
190
- var peg$c35 = "thursday";
191
- var peg$c36 = "friday";
192
- var peg$c37 = "saturday";
193
- var peg$c38 = "sunday";
170
+ var peg$c15 = "none";
171
+ var peg$c16 = "to";
172
+ var peg$c17 = "now";
173
+ var peg$c18 = "last";
174
+ var peg$c19 = "this";
175
+ var peg$c20 = "next";
176
+ var peg$c21 = "ago";
177
+ var peg$c22 = "from";
178
+ var peg$c23 = "before";
179
+ var peg$c24 = "after";
180
+ var peg$c25 = "through";
181
+ var peg$c26 = "starting";
182
+ var peg$c27 = "for";
183
+ var peg$c28 = "today";
184
+ var peg$c29 = "yesterday";
185
+ var peg$c30 = "tomorrow";
186
+ var peg$c31 = "and";
187
+ var peg$c32 = "or";
188
+ var peg$c33 = "monday";
189
+ var peg$c34 = "tuesday";
190
+ var peg$c35 = "wednesday";
191
+ var peg$c36 = "thursday";
192
+ var peg$c37 = "friday";
193
+ var peg$c38 = "saturday";
194
+ var peg$c39 = "sunday";
194
195
  var peg$r0 = /^[0-9]/;
195
196
  var peg$r1 = /^[ Tt]/;
196
197
  var peg$r2 = /^[.,]/;
@@ -222,80 +223,82 @@ function peg$parse(input, options) {
222
223
  var peg$e19 = peg$classExpectation(["1", "2", "3", "4"], false, false);
223
224
  var peg$e20 = peg$literalExpectation("not", true);
224
225
  var peg$e21 = peg$literalExpectation("null", true);
225
- var peg$e22 = peg$literalExpectation("to", true);
226
- var peg$e23 = peg$literalExpectation("now", true);
227
- var peg$e24 = peg$literalExpectation("last", true);
228
- var peg$e25 = peg$literalExpectation("this", true);
229
- var peg$e26 = peg$literalExpectation("next", true);
230
- var peg$e27 = peg$literalExpectation("ago", true);
231
- var peg$e28 = peg$literalExpectation("from", true);
232
- var peg$e29 = peg$literalExpectation("before", true);
233
- var peg$e30 = peg$literalExpectation("after", true);
234
- var peg$e31 = peg$literalExpectation("through", true);
235
- var peg$e32 = peg$literalExpectation("starting", true);
236
- var peg$e33 = peg$literalExpectation("for", true);
237
- var peg$e34 = peg$literalExpectation("today", true);
238
- var peg$e35 = peg$literalExpectation("yesterday", true);
239
- var peg$e36 = peg$literalExpectation("tomorrow", true);
240
- var peg$e37 = peg$literalExpectation("and", true);
241
- var peg$e38 = peg$literalExpectation("or", true);
242
- var peg$e39 = peg$literalExpectation("monday", true);
243
- var peg$e40 = peg$literalExpectation("tuesday", true);
244
- var peg$e41 = peg$literalExpectation("wednesday", true);
245
- var peg$e42 = peg$literalExpectation("thursday", true);
246
- var peg$e43 = peg$literalExpectation("friday", true);
247
- var peg$e44 = peg$literalExpectation("saturday", true);
248
- var peg$e45 = peg$literalExpectation("sunday", true);
249
- var peg$e46 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false);
250
- var peg$e47 = peg$otherExpectation("optional whitespace");
251
- var peg$e48 = peg$classExpectation([" ", "\t"], false, false);
252
- var peg$e49 = peg$otherExpectation("whitespace");
226
+ var peg$e22 = peg$literalExpectation("none", true);
227
+ var peg$e23 = peg$literalExpectation("to", true);
228
+ var peg$e24 = peg$literalExpectation("now", true);
229
+ var peg$e25 = peg$literalExpectation("last", true);
230
+ var peg$e26 = peg$literalExpectation("this", true);
231
+ var peg$e27 = peg$literalExpectation("next", true);
232
+ var peg$e28 = peg$literalExpectation("ago", true);
233
+ var peg$e29 = peg$literalExpectation("from", true);
234
+ var peg$e30 = peg$literalExpectation("before", true);
235
+ var peg$e31 = peg$literalExpectation("after", true);
236
+ var peg$e32 = peg$literalExpectation("through", true);
237
+ var peg$e33 = peg$literalExpectation("starting", true);
238
+ var peg$e34 = peg$literalExpectation("for", true);
239
+ var peg$e35 = peg$literalExpectation("today", true);
240
+ var peg$e36 = peg$literalExpectation("yesterday", true);
241
+ var peg$e37 = peg$literalExpectation("tomorrow", true);
242
+ var peg$e38 = peg$literalExpectation("and", true);
243
+ var peg$e39 = peg$literalExpectation("or", true);
244
+ var peg$e40 = peg$literalExpectation("monday", true);
245
+ var peg$e41 = peg$literalExpectation("tuesday", true);
246
+ var peg$e42 = peg$literalExpectation("wednesday", true);
247
+ var peg$e43 = peg$literalExpectation("thursday", true);
248
+ var peg$e44 = peg$literalExpectation("friday", true);
249
+ var peg$e45 = peg$literalExpectation("saturday", true);
250
+ var peg$e46 = peg$literalExpectation("sunday", true);
251
+ var peg$e47 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false);
252
+ var peg$e48 = peg$otherExpectation("optional whitespace");
253
+ var peg$e49 = peg$classExpectation([" ", "\t"], false, false);
254
+ var peg$e50 = peg$otherExpectation("whitespace");
253
255
  var peg$f0 = function (head, tail) {
254
256
  return tail.reduce((left, [, cop, , right]) => joinTemporal(left, cop, right), head);
255
257
  };
256
258
  var peg$f1 = function (clause) { return temporalNot(clause, true); };
257
259
  var peg$f2 = function (clause) { return clause; };
258
260
  var peg$f3 = function () { return { operator: 'null' }; };
259
- var peg$f4 = function (expr) { return { operator: "()", expr }; };
260
- var peg$f5 = function (m) { return { operator: 'before', before: m }; };
261
- var peg$f6 = function (m) { return { operator: 'before', before: m, not: true }; };
262
- var peg$f7 = function (m) { return { operator: 'after', after: m }; };
263
- var peg$f8 = function (m) { return { operator: 'after', after: m, not: true }; };
264
- var peg$f9 = function (ln, d) { return { operator: ln, ...d }; };
265
- var peg$f10 = function (m, m2) { return { operator: 'to', fromMoment: m, toMoment: m2 }; };
266
- var peg$f11 = function (m, d) { return { ...d, operator: 'for', begin: m }; };
267
- var peg$f12 = function (m) { return { operator: 'in', in: m }; };
268
- var peg$f13 = function (d) { return { operator: 'in_last', ...d }; };
269
- var peg$f14 = function () { return 'last'; };
270
- var peg$f15 = function () { return 'next'; };
271
- var peg$f16 = function (n, u) { return { units: u, n }; };
272
- var peg$f17 = function (n) { return n; };
273
- var peg$f18 = function (u) { return mkUnits(u); };
274
- var peg$f19 = function () { return { moment: 'now' }; };
275
- var peg$f20 = function () { return { moment: 'today' }; };
276
- var peg$f21 = function () { return { moment: 'yesterday' }; };
277
- var peg$f22 = function () { return { moment: 'tomorrow' }; };
278
- var peg$f23 = function (d) { return { moment: 'ago', ...d }; };
279
- var peg$f24 = function (d) { return { moment: 'from_now', ...d }; };
280
- var peg$f25 = function (dn) { return { moment: dn.toLowerCase(), which: 'next' }; };
281
- var peg$f26 = function (dn) { return { moment: dn.toLowerCase(), which: 'last' }; };
282
- var peg$f27 = function (lnt, u) { return { moment: lnt, units: u }; };
283
- var peg$f28 = function (dn) { return { moment: dn.toLowerCase(), which: 'last' }; };
284
- var peg$f29 = function (tl) { return tl; };
285
- var peg$f30 = function () { return 'this'; };
286
- var peg$f31 = function () { return 'next'; };
287
- var peg$f32 = function () { return 'last'; };
288
- var peg$f33 = function (l) { return timeLiteral(l); };
289
- var peg$f34 = function (l) { return timeLiteral(l, 'week'); };
290
- var peg$f35 = function (l) { return timeLiteral(l, 'quarter'); };
291
- var peg$f36 = function (l) { return timeLiteral(l, 'minute'); };
292
- var peg$f37 = function (l) { return timeLiteral(l, 'hour'); };
293
- var peg$f38 = function (l) { return timeLiteral(l, 'day'); };
294
- var peg$f39 = function (l) { return timeLiteral(l, 'month'); };
295
- var peg$f40 = function (l) { return timeLiteral(l, 'year'); };
296
- var peg$f41 = function (w) { return w; };
297
- var peg$f42 = function () { return "or"; };
298
- var peg$f43 = function () { return "and"; };
261
+ var peg$f4 = function () { return { operator: 'none' }; };
262
+ var peg$f5 = function (expr) { return { operator: "()", expr }; };
263
+ var peg$f6 = function (m) { return { operator: 'before', before: m }; };
264
+ var peg$f7 = function (m) { return { operator: 'before', before: m, not: true }; };
265
+ var peg$f8 = function (m) { return { operator: 'after', after: m }; };
266
+ var peg$f9 = function (m) { return { operator: 'after', after: m, not: true }; };
267
+ var peg$f10 = function (ln, d) { return { operator: ln, ...d }; };
268
+ var peg$f11 = function (m, m2) { return { operator: 'to', fromMoment: m, toMoment: m2 }; };
269
+ var peg$f12 = function (m, d) { return { ...d, operator: 'for', begin: m }; };
270
+ var peg$f13 = function (m) { return { operator: 'in', in: m }; };
271
+ var peg$f14 = function (d) { return { operator: 'in_last', ...d }; };
272
+ var peg$f15 = function () { return 'last'; };
273
+ var peg$f16 = function () { return 'next'; };
274
+ var peg$f17 = function (n, u) { return { units: u, n }; };
275
+ var peg$f18 = function (n) { return n; };
276
+ var peg$f19 = function (u) { return mkUnits(u); };
277
+ var peg$f20 = function () { return { moment: 'now' }; };
278
+ var peg$f21 = function () { return { moment: 'today' }; };
279
+ var peg$f22 = function () { return { moment: 'yesterday' }; };
280
+ var peg$f23 = function () { return { moment: 'tomorrow' }; };
281
+ var peg$f24 = function (d) { return { moment: 'ago', ...d }; };
282
+ var peg$f25 = function (d) { return { moment: 'from_now', ...d }; };
283
+ var peg$f26 = function (dn) { return { moment: dn.toLowerCase(), which: 'next' }; };
284
+ var peg$f27 = function (dn) { return { moment: dn.toLowerCase(), which: 'last' }; };
285
+ var peg$f28 = function (lnt, u) { return { moment: lnt, units: u }; };
286
+ var peg$f29 = function (dn) { return { moment: dn.toLowerCase(), which: 'last' }; };
287
+ var peg$f30 = function (tl) { return tl; };
288
+ var peg$f31 = function () { return 'this'; };
289
+ var peg$f32 = function () { return 'next'; };
290
+ var peg$f33 = function () { return 'last'; };
291
+ var peg$f34 = function (l) { return timeLiteral(l); };
292
+ var peg$f35 = function (l) { return timeLiteral(l, 'week'); };
293
+ var peg$f36 = function (l) { return timeLiteral(l, 'quarter'); };
294
+ var peg$f37 = function (l) { return timeLiteral(l, 'minute'); };
295
+ var peg$f38 = function (l) { return timeLiteral(l, 'hour'); };
296
+ var peg$f39 = function (l) { return timeLiteral(l, 'day'); };
297
+ var peg$f40 = function (l) { return timeLiteral(l, 'month'); };
298
+ var peg$f41 = function (l) { return timeLiteral(l, 'year'); };
299
+ var peg$f42 = function (w) { return w; };
300
+ var peg$f43 = function () { return "or"; };
301
+ var peg$f44 = function () { return "and"; };
299
302
  var peg$currPos = options.peg$currPos | 0;
300
303
  var peg$savedPos = peg$currPos;
301
304
  var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -527,57 +530,40 @@ function peg$parse(input, options) {
527
530
  s0 = s1;
528
531
  if (s0 === peg$FAILED) {
529
532
  s0 = peg$currPos;
530
- if (input.charCodeAt(peg$currPos) === 40) {
531
- s1 = peg$c0;
532
- peg$currPos++;
533
- }
534
- else {
535
- s1 = peg$FAILED;
536
- if (peg$silentFails === 0) {
537
- peg$fail(peg$e0);
538
- }
539
- }
533
+ s1 = peg$parseNONE();
540
534
  if (s1 !== peg$FAILED) {
541
- s2 = peg$parse_();
542
- s3 = peg$parsetemporalFilter();
543
- if (s3 !== peg$FAILED) {
544
- s4 = peg$parse_();
545
- if (input.charCodeAt(peg$currPos) === 41) {
546
- s5 = peg$c1;
547
- peg$currPos++;
548
- }
549
- else {
550
- s5 = peg$FAILED;
551
- if (peg$silentFails === 0) {
552
- peg$fail(peg$e1);
553
- }
554
- }
555
- if (s5 !== peg$FAILED) {
556
- peg$savedPos = s0;
557
- s0 = peg$f4(s3);
558
- }
559
- else {
560
- peg$currPos = s0;
561
- s0 = peg$FAILED;
562
- }
563
- }
564
- else {
565
- peg$currPos = s0;
566
- s0 = peg$FAILED;
567
- }
568
- }
569
- else {
570
- peg$currPos = s0;
571
- s0 = peg$FAILED;
535
+ peg$savedPos = s0;
536
+ s1 = peg$f4();
572
537
  }
538
+ s0 = s1;
573
539
  if (s0 === peg$FAILED) {
574
540
  s0 = peg$currPos;
575
- s1 = peg$parseBEFORE();
541
+ if (input.charCodeAt(peg$currPos) === 40) {
542
+ s1 = peg$c0;
543
+ peg$currPos++;
544
+ }
545
+ else {
546
+ s1 = peg$FAILED;
547
+ if (peg$silentFails === 0) {
548
+ peg$fail(peg$e0);
549
+ }
550
+ }
576
551
  if (s1 !== peg$FAILED) {
577
- s2 = peg$parse__();
578
- if (s2 !== peg$FAILED) {
579
- s3 = peg$parsemoment();
580
- if (s3 !== peg$FAILED) {
552
+ s2 = peg$parse_();
553
+ s3 = peg$parsetemporalFilter();
554
+ if (s3 !== peg$FAILED) {
555
+ s4 = peg$parse_();
556
+ if (input.charCodeAt(peg$currPos) === 41) {
557
+ s5 = peg$c1;
558
+ peg$currPos++;
559
+ }
560
+ else {
561
+ s5 = peg$FAILED;
562
+ if (peg$silentFails === 0) {
563
+ peg$fail(peg$e1);
564
+ }
565
+ }
566
+ if (s5 !== peg$FAILED) {
581
567
  peg$savedPos = s0;
582
568
  s0 = peg$f5(s3);
583
569
  }
@@ -597,7 +583,7 @@ function peg$parse(input, options) {
597
583
  }
598
584
  if (s0 === peg$FAILED) {
599
585
  s0 = peg$currPos;
600
- s1 = peg$parseSTARTING();
586
+ s1 = peg$parseBEFORE();
601
587
  if (s1 !== peg$FAILED) {
602
588
  s2 = peg$parse__();
603
589
  if (s2 !== peg$FAILED) {
@@ -622,7 +608,7 @@ function peg$parse(input, options) {
622
608
  }
623
609
  if (s0 === peg$FAILED) {
624
610
  s0 = peg$currPos;
625
- s1 = peg$parseAFTER();
611
+ s1 = peg$parseSTARTING();
626
612
  if (s1 !== peg$FAILED) {
627
613
  s2 = peg$parse__();
628
614
  if (s2 !== peg$FAILED) {
@@ -647,7 +633,7 @@ function peg$parse(input, options) {
647
633
  }
648
634
  if (s0 === peg$FAILED) {
649
635
  s0 = peg$currPos;
650
- s1 = peg$parseTHROUGH();
636
+ s1 = peg$parseAFTER();
651
637
  if (s1 !== peg$FAILED) {
652
638
  s2 = peg$parse__();
653
639
  if (s2 !== peg$FAILED) {
@@ -672,14 +658,14 @@ function peg$parse(input, options) {
672
658
  }
673
659
  if (s0 === peg$FAILED) {
674
660
  s0 = peg$currPos;
675
- s1 = peg$parselastOrNext();
661
+ s1 = peg$parseTHROUGH();
676
662
  if (s1 !== peg$FAILED) {
677
663
  s2 = peg$parse__();
678
664
  if (s2 !== peg$FAILED) {
679
- s3 = peg$parseduration();
665
+ s3 = peg$parsemoment();
680
666
  if (s3 !== peg$FAILED) {
681
667
  peg$savedPos = s0;
682
- s0 = peg$f9(s1, s3);
668
+ s0 = peg$f9(s3);
683
669
  }
684
670
  else {
685
671
  peg$currPos = s0;
@@ -697,28 +683,14 @@ function peg$parse(input, options) {
697
683
  }
698
684
  if (s0 === peg$FAILED) {
699
685
  s0 = peg$currPos;
700
- s1 = peg$parsemoment();
686
+ s1 = peg$parselastOrNext();
701
687
  if (s1 !== peg$FAILED) {
702
688
  s2 = peg$parse__();
703
689
  if (s2 !== peg$FAILED) {
704
- s3 = peg$parseTO();
690
+ s3 = peg$parseduration();
705
691
  if (s3 !== peg$FAILED) {
706
- s4 = peg$parse__();
707
- if (s4 !== peg$FAILED) {
708
- s5 = peg$parsemoment();
709
- if (s5 !== peg$FAILED) {
710
- peg$savedPos = s0;
711
- s0 = peg$f10(s1, s5);
712
- }
713
- else {
714
- peg$currPos = s0;
715
- s0 = peg$FAILED;
716
- }
717
- }
718
- else {
719
- peg$currPos = s0;
720
- s0 = peg$FAILED;
721
- }
692
+ peg$savedPos = s0;
693
+ s0 = peg$f10(s1, s3);
722
694
  }
723
695
  else {
724
696
  peg$currPos = s0;
@@ -740,11 +712,11 @@ function peg$parse(input, options) {
740
712
  if (s1 !== peg$FAILED) {
741
713
  s2 = peg$parse__();
742
714
  if (s2 !== peg$FAILED) {
743
- s3 = peg$parseFOR();
715
+ s3 = peg$parseTO();
744
716
  if (s3 !== peg$FAILED) {
745
717
  s4 = peg$parse__();
746
718
  if (s4 !== peg$FAILED) {
747
- s5 = peg$parseduration();
719
+ s5 = peg$parsemoment();
748
720
  if (s5 !== peg$FAILED) {
749
721
  peg$savedPos = s0;
750
722
  s0 = peg$f11(s1, s5);
@@ -777,18 +749,58 @@ function peg$parse(input, options) {
777
749
  s0 = peg$currPos;
778
750
  s1 = peg$parsemoment();
779
751
  if (s1 !== peg$FAILED) {
780
- peg$savedPos = s0;
781
- s1 = peg$f12(s1);
752
+ s2 = peg$parse__();
753
+ if (s2 !== peg$FAILED) {
754
+ s3 = peg$parseFOR();
755
+ if (s3 !== peg$FAILED) {
756
+ s4 = peg$parse__();
757
+ if (s4 !== peg$FAILED) {
758
+ s5 = peg$parseduration();
759
+ if (s5 !== peg$FAILED) {
760
+ peg$savedPos = s0;
761
+ s0 = peg$f12(s1, s5);
762
+ }
763
+ else {
764
+ peg$currPos = s0;
765
+ s0 = peg$FAILED;
766
+ }
767
+ }
768
+ else {
769
+ peg$currPos = s0;
770
+ s0 = peg$FAILED;
771
+ }
772
+ }
773
+ else {
774
+ peg$currPos = s0;
775
+ s0 = peg$FAILED;
776
+ }
777
+ }
778
+ else {
779
+ peg$currPos = s0;
780
+ s0 = peg$FAILED;
781
+ }
782
+ }
783
+ else {
784
+ peg$currPos = s0;
785
+ s0 = peg$FAILED;
782
786
  }
783
- s0 = s1;
784
787
  if (s0 === peg$FAILED) {
785
788
  s0 = peg$currPos;
786
- s1 = peg$parseduration();
789
+ s1 = peg$parsemoment();
787
790
  if (s1 !== peg$FAILED) {
788
791
  peg$savedPos = s0;
789
792
  s1 = peg$f13(s1);
790
793
  }
791
794
  s0 = s1;
795
+ if (s0 === peg$FAILED) {
796
+ s0 = peg$currPos;
797
+ s1 = peg$parseduration();
798
+ if (s1 !== peg$FAILED) {
799
+ peg$savedPos = s0;
800
+ s1 = peg$f14(s1);
801
+ }
802
+ s0 = s1;
803
+ }
792
804
  }
793
805
  }
794
806
  }
@@ -807,7 +819,7 @@ function peg$parse(input, options) {
807
819
  s1 = peg$parseLAST();
808
820
  if (s1 !== peg$FAILED) {
809
821
  peg$savedPos = s0;
810
- s1 = peg$f14();
822
+ s1 = peg$f15();
811
823
  }
812
824
  s0 = s1;
813
825
  if (s0 === peg$FAILED) {
@@ -815,7 +827,7 @@ function peg$parse(input, options) {
815
827
  s1 = peg$parseNEXT();
816
828
  if (s1 !== peg$FAILED) {
817
829
  peg$savedPos = s0;
818
- s1 = peg$f15();
830
+ s1 = peg$f16();
819
831
  }
820
832
  s0 = s1;
821
833
  }
@@ -831,7 +843,7 @@ function peg$parse(input, options) {
831
843
  s3 = peg$parseunit();
832
844
  if (s3 !== peg$FAILED) {
833
845
  peg$savedPos = s0;
834
- s0 = peg$f16(s1, s3);
846
+ s0 = peg$f17(s1, s3);
835
847
  }
836
848
  else {
837
849
  peg$currPos = s0;
@@ -890,7 +902,7 @@ function peg$parse(input, options) {
890
902
  }
891
903
  if (s1 !== peg$FAILED) {
892
904
  peg$savedPos = s0;
893
- s1 = peg$f17(s1);
905
+ s1 = peg$f18(s1);
894
906
  }
895
907
  s0 = s1;
896
908
  return s0;
@@ -1026,7 +1038,7 @@ function peg$parse(input, options) {
1026
1038
  }
1027
1039
  if (s3 !== peg$FAILED) {
1028
1040
  peg$savedPos = s0;
1029
- s0 = peg$f18(s1);
1041
+ s0 = peg$f19(s1);
1030
1042
  }
1031
1043
  else {
1032
1044
  peg$currPos = s0;
@@ -1045,7 +1057,7 @@ function peg$parse(input, options) {
1045
1057
  s1 = peg$parseNOW();
1046
1058
  if (s1 !== peg$FAILED) {
1047
1059
  peg$savedPos = s0;
1048
- s1 = peg$f19();
1060
+ s1 = peg$f20();
1049
1061
  }
1050
1062
  s0 = s1;
1051
1063
  if (s0 === peg$FAILED) {
@@ -1053,7 +1065,7 @@ function peg$parse(input, options) {
1053
1065
  s1 = peg$parseTODAY();
1054
1066
  if (s1 !== peg$FAILED) {
1055
1067
  peg$savedPos = s0;
1056
- s1 = peg$f20();
1068
+ s1 = peg$f21();
1057
1069
  }
1058
1070
  s0 = s1;
1059
1071
  if (s0 === peg$FAILED) {
@@ -1061,7 +1073,7 @@ function peg$parse(input, options) {
1061
1073
  s1 = peg$parseYESTERDAY();
1062
1074
  if (s1 !== peg$FAILED) {
1063
1075
  peg$savedPos = s0;
1064
- s1 = peg$f21();
1076
+ s1 = peg$f22();
1065
1077
  }
1066
1078
  s0 = s1;
1067
1079
  if (s0 === peg$FAILED) {
@@ -1069,7 +1081,7 @@ function peg$parse(input, options) {
1069
1081
  s1 = peg$parseTOMORROW();
1070
1082
  if (s1 !== peg$FAILED) {
1071
1083
  peg$savedPos = s0;
1072
- s1 = peg$f22();
1084
+ s1 = peg$f23();
1073
1085
  }
1074
1086
  s0 = s1;
1075
1087
  if (s0 === peg$FAILED) {
@@ -1081,7 +1093,7 @@ function peg$parse(input, options) {
1081
1093
  s3 = peg$parseAGO();
1082
1094
  if (s3 !== peg$FAILED) {
1083
1095
  peg$savedPos = s0;
1084
- s0 = peg$f23(s1);
1096
+ s0 = peg$f24(s1);
1085
1097
  }
1086
1098
  else {
1087
1099
  peg$currPos = s0;
@@ -1110,7 +1122,7 @@ function peg$parse(input, options) {
1110
1122
  s5 = peg$parseNOW();
1111
1123
  if (s5 !== peg$FAILED) {
1112
1124
  peg$savedPos = s0;
1113
- s0 = peg$f24(s1);
1125
+ s0 = peg$f25(s1);
1114
1126
  }
1115
1127
  else {
1116
1128
  peg$currPos = s0;
@@ -1145,7 +1157,7 @@ function peg$parse(input, options) {
1145
1157
  s3 = peg$parseweekday();
1146
1158
  if (s3 !== peg$FAILED) {
1147
1159
  peg$savedPos = s0;
1148
- s0 = peg$f25(s3);
1160
+ s0 = peg$f26(s3);
1149
1161
  }
1150
1162
  else {
1151
1163
  peg$currPos = s0;
@@ -1170,7 +1182,7 @@ function peg$parse(input, options) {
1170
1182
  s3 = peg$parseweekday();
1171
1183
  if (s3 !== peg$FAILED) {
1172
1184
  peg$savedPos = s0;
1173
- s0 = peg$f26(s3);
1185
+ s0 = peg$f27(s3);
1174
1186
  }
1175
1187
  else {
1176
1188
  peg$currPos = s0;
@@ -1195,7 +1207,7 @@ function peg$parse(input, options) {
1195
1207
  s3 = peg$parseunit();
1196
1208
  if (s3 !== peg$FAILED) {
1197
1209
  peg$savedPos = s0;
1198
- s0 = peg$f27(s1, s3);
1210
+ s0 = peg$f28(s1, s3);
1199
1211
  }
1200
1212
  else {
1201
1213
  peg$currPos = s0;
@@ -1216,7 +1228,7 @@ function peg$parse(input, options) {
1216
1228
  s1 = peg$parseweekday();
1217
1229
  if (s1 !== peg$FAILED) {
1218
1230
  peg$savedPos = s0;
1219
- s1 = peg$f28(s1);
1231
+ s1 = peg$f29(s1);
1220
1232
  }
1221
1233
  s0 = s1;
1222
1234
  if (s0 === peg$FAILED) {
@@ -1224,7 +1236,7 @@ function peg$parse(input, options) {
1224
1236
  s1 = peg$parsetimeLiteral();
1225
1237
  if (s1 !== peg$FAILED) {
1226
1238
  peg$savedPos = s0;
1227
- s1 = peg$f29(s1);
1239
+ s1 = peg$f30(s1);
1228
1240
  }
1229
1241
  s0 = s1;
1230
1242
  }
@@ -1245,7 +1257,7 @@ function peg$parse(input, options) {
1245
1257
  s1 = peg$parseTHIS();
1246
1258
  if (s1 !== peg$FAILED) {
1247
1259
  peg$savedPos = s0;
1248
- s1 = peg$f30();
1260
+ s1 = peg$f31();
1249
1261
  }
1250
1262
  s0 = s1;
1251
1263
  if (s0 === peg$FAILED) {
@@ -1253,7 +1265,7 @@ function peg$parse(input, options) {
1253
1265
  s1 = peg$parseNEXT();
1254
1266
  if (s1 !== peg$FAILED) {
1255
1267
  peg$savedPos = s0;
1256
- s1 = peg$f31();
1268
+ s1 = peg$f32();
1257
1269
  }
1258
1270
  s0 = s1;
1259
1271
  if (s0 === peg$FAILED) {
@@ -1261,7 +1273,7 @@ function peg$parse(input, options) {
1261
1273
  s1 = peg$parseLAST();
1262
1274
  if (s1 !== peg$FAILED) {
1263
1275
  peg$savedPos = s0;
1264
- s1 = peg$f32();
1276
+ s1 = peg$f33();
1265
1277
  }
1266
1278
  s0 = s1;
1267
1279
  }
@@ -1633,7 +1645,7 @@ function peg$parse(input, options) {
1633
1645
  }
1634
1646
  if (s1 !== peg$FAILED) {
1635
1647
  peg$savedPos = s0;
1636
- s1 = peg$f33(s1);
1648
+ s1 = peg$f34(s1);
1637
1649
  }
1638
1650
  s0 = s1;
1639
1651
  if (s0 === peg$FAILED) {
@@ -1858,7 +1870,7 @@ function peg$parse(input, options) {
1858
1870
  }
1859
1871
  if (s1 !== peg$FAILED) {
1860
1872
  peg$savedPos = s0;
1861
- s1 = peg$f34(s1);
1873
+ s1 = peg$f35(s1);
1862
1874
  }
1863
1875
  s0 = s1;
1864
1876
  if (s0 === peg$FAILED) {
@@ -1987,7 +1999,7 @@ function peg$parse(input, options) {
1987
1999
  }
1988
2000
  if (s1 !== peg$FAILED) {
1989
2001
  peg$savedPos = s0;
1990
- s1 = peg$f35(s1);
2002
+ s1 = peg$f36(s1);
1991
2003
  }
1992
2004
  s0 = s1;
1993
2005
  if (s0 === peg$FAILED) {
@@ -2260,7 +2272,7 @@ function peg$parse(input, options) {
2260
2272
  }
2261
2273
  if (s1 !== peg$FAILED) {
2262
2274
  peg$savedPos = s0;
2263
- s1 = peg$f36(s1);
2275
+ s1 = peg$f37(s1);
2264
2276
  }
2265
2277
  s0 = s1;
2266
2278
  if (s0 === peg$FAILED) {
@@ -2485,7 +2497,7 @@ function peg$parse(input, options) {
2485
2497
  }
2486
2498
  if (s1 !== peg$FAILED) {
2487
2499
  peg$savedPos = s0;
2488
- s1 = peg$f37(s1);
2500
+ s1 = peg$f38(s1);
2489
2501
  }
2490
2502
  s0 = s1;
2491
2503
  if (s0 === peg$FAILED) {
@@ -2662,7 +2674,7 @@ function peg$parse(input, options) {
2662
2674
  }
2663
2675
  if (s1 !== peg$FAILED) {
2664
2676
  peg$savedPos = s0;
2665
- s1 = peg$f38(s1);
2677
+ s1 = peg$f39(s1);
2666
2678
  }
2667
2679
  s0 = s1;
2668
2680
  if (s0 === peg$FAILED) {
@@ -2791,7 +2803,7 @@ function peg$parse(input, options) {
2791
2803
  }
2792
2804
  if (s1 !== peg$FAILED) {
2793
2805
  peg$savedPos = s0;
2794
- s1 = peg$f39(s1);
2806
+ s1 = peg$f40(s1);
2795
2807
  }
2796
2808
  s0 = s1;
2797
2809
  if (s0 === peg$FAILED) {
@@ -2872,7 +2884,7 @@ function peg$parse(input, options) {
2872
2884
  }
2873
2885
  if (s1 !== peg$FAILED) {
2874
2886
  peg$savedPos = s0;
2875
- s1 = peg$f40(s1);
2887
+ s1 = peg$f41(s1);
2876
2888
  }
2877
2889
  s0 = s1;
2878
2890
  }
@@ -2915,7 +2927,7 @@ function peg$parse(input, options) {
2915
2927
  }
2916
2928
  if (s1 !== peg$FAILED) {
2917
2929
  peg$savedPos = s0;
2918
- s1 = peg$f41(s1);
2930
+ s1 = peg$f42(s1);
2919
2931
  }
2920
2932
  s0 = s1;
2921
2933
  return s0;
@@ -2926,7 +2938,7 @@ function peg$parse(input, options) {
2926
2938
  s1 = peg$parseOR();
2927
2939
  if (s1 !== peg$FAILED) {
2928
2940
  peg$savedPos = s0;
2929
- s1 = peg$f42();
2941
+ s1 = peg$f43();
2930
2942
  }
2931
2943
  s0 = s1;
2932
2944
  if (s0 === peg$FAILED) {
@@ -2934,7 +2946,7 @@ function peg$parse(input, options) {
2934
2946
  s1 = peg$parseAND();
2935
2947
  if (s1 !== peg$FAILED) {
2936
2948
  peg$savedPos = s0;
2937
- s1 = peg$f43();
2949
+ s1 = peg$f44();
2938
2950
  }
2939
2951
  s0 = s1;
2940
2952
  }
@@ -3020,17 +3032,57 @@ function peg$parse(input, options) {
3020
3032
  }
3021
3033
  return s0;
3022
3034
  }
3035
+ function peg$parseNONE() {
3036
+ var s0, s1, s2, s3;
3037
+ s0 = peg$currPos;
3038
+ s1 = input.substr(peg$currPos, 4);
3039
+ if (s1.toLowerCase() === peg$c15) {
3040
+ peg$currPos += 4;
3041
+ }
3042
+ else {
3043
+ s1 = peg$FAILED;
3044
+ if (peg$silentFails === 0) {
3045
+ peg$fail(peg$e22);
3046
+ }
3047
+ }
3048
+ if (s1 !== peg$FAILED) {
3049
+ s2 = peg$currPos;
3050
+ peg$silentFails++;
3051
+ s3 = peg$parseidChar();
3052
+ peg$silentFails--;
3053
+ if (s3 === peg$FAILED) {
3054
+ s2 = undefined;
3055
+ }
3056
+ else {
3057
+ peg$currPos = s2;
3058
+ s2 = peg$FAILED;
3059
+ }
3060
+ if (s2 !== peg$FAILED) {
3061
+ s1 = [s1, s2];
3062
+ s0 = s1;
3063
+ }
3064
+ else {
3065
+ peg$currPos = s0;
3066
+ s0 = peg$FAILED;
3067
+ }
3068
+ }
3069
+ else {
3070
+ peg$currPos = s0;
3071
+ s0 = peg$FAILED;
3072
+ }
3073
+ return s0;
3074
+ }
3023
3075
  function peg$parseTO() {
3024
3076
  var s0, s1, s2, s3;
3025
3077
  s0 = peg$currPos;
3026
3078
  s1 = input.substr(peg$currPos, 2);
3027
- if (s1.toLowerCase() === peg$c15) {
3079
+ if (s1.toLowerCase() === peg$c16) {
3028
3080
  peg$currPos += 2;
3029
3081
  }
3030
3082
  else {
3031
3083
  s1 = peg$FAILED;
3032
3084
  if (peg$silentFails === 0) {
3033
- peg$fail(peg$e22);
3085
+ peg$fail(peg$e23);
3034
3086
  }
3035
3087
  }
3036
3088
  if (s1 !== peg$FAILED) {
@@ -3064,13 +3116,13 @@ function peg$parse(input, options) {
3064
3116
  var s0, s1, s2, s3;
3065
3117
  s0 = peg$currPos;
3066
3118
  s1 = input.substr(peg$currPos, 3);
3067
- if (s1.toLowerCase() === peg$c16) {
3119
+ if (s1.toLowerCase() === peg$c17) {
3068
3120
  peg$currPos += 3;
3069
3121
  }
3070
3122
  else {
3071
3123
  s1 = peg$FAILED;
3072
3124
  if (peg$silentFails === 0) {
3073
- peg$fail(peg$e23);
3125
+ peg$fail(peg$e24);
3074
3126
  }
3075
3127
  }
3076
3128
  if (s1 !== peg$FAILED) {
@@ -3104,13 +3156,13 @@ function peg$parse(input, options) {
3104
3156
  var s0, s1, s2, s3;
3105
3157
  s0 = peg$currPos;
3106
3158
  s1 = input.substr(peg$currPos, 4);
3107
- if (s1.toLowerCase() === peg$c17) {
3159
+ if (s1.toLowerCase() === peg$c18) {
3108
3160
  peg$currPos += 4;
3109
3161
  }
3110
3162
  else {
3111
3163
  s1 = peg$FAILED;
3112
3164
  if (peg$silentFails === 0) {
3113
- peg$fail(peg$e24);
3165
+ peg$fail(peg$e25);
3114
3166
  }
3115
3167
  }
3116
3168
  if (s1 !== peg$FAILED) {
@@ -3144,13 +3196,13 @@ function peg$parse(input, options) {
3144
3196
  var s0, s1, s2, s3;
3145
3197
  s0 = peg$currPos;
3146
3198
  s1 = input.substr(peg$currPos, 4);
3147
- if (s1.toLowerCase() === peg$c18) {
3199
+ if (s1.toLowerCase() === peg$c19) {
3148
3200
  peg$currPos += 4;
3149
3201
  }
3150
3202
  else {
3151
3203
  s1 = peg$FAILED;
3152
3204
  if (peg$silentFails === 0) {
3153
- peg$fail(peg$e25);
3205
+ peg$fail(peg$e26);
3154
3206
  }
3155
3207
  }
3156
3208
  if (s1 !== peg$FAILED) {
@@ -3184,13 +3236,13 @@ function peg$parse(input, options) {
3184
3236
  var s0, s1, s2, s3;
3185
3237
  s0 = peg$currPos;
3186
3238
  s1 = input.substr(peg$currPos, 4);
3187
- if (s1.toLowerCase() === peg$c19) {
3239
+ if (s1.toLowerCase() === peg$c20) {
3188
3240
  peg$currPos += 4;
3189
3241
  }
3190
3242
  else {
3191
3243
  s1 = peg$FAILED;
3192
3244
  if (peg$silentFails === 0) {
3193
- peg$fail(peg$e26);
3245
+ peg$fail(peg$e27);
3194
3246
  }
3195
3247
  }
3196
3248
  if (s1 !== peg$FAILED) {
@@ -3224,13 +3276,13 @@ function peg$parse(input, options) {
3224
3276
  var s0, s1, s2, s3;
3225
3277
  s0 = peg$currPos;
3226
3278
  s1 = input.substr(peg$currPos, 3);
3227
- if (s1.toLowerCase() === peg$c20) {
3279
+ if (s1.toLowerCase() === peg$c21) {
3228
3280
  peg$currPos += 3;
3229
3281
  }
3230
3282
  else {
3231
3283
  s1 = peg$FAILED;
3232
3284
  if (peg$silentFails === 0) {
3233
- peg$fail(peg$e27);
3285
+ peg$fail(peg$e28);
3234
3286
  }
3235
3287
  }
3236
3288
  if (s1 !== peg$FAILED) {
@@ -3264,13 +3316,13 @@ function peg$parse(input, options) {
3264
3316
  var s0, s1, s2, s3;
3265
3317
  s0 = peg$currPos;
3266
3318
  s1 = input.substr(peg$currPos, 4);
3267
- if (s1.toLowerCase() === peg$c21) {
3319
+ if (s1.toLowerCase() === peg$c22) {
3268
3320
  peg$currPos += 4;
3269
3321
  }
3270
3322
  else {
3271
3323
  s1 = peg$FAILED;
3272
3324
  if (peg$silentFails === 0) {
3273
- peg$fail(peg$e28);
3325
+ peg$fail(peg$e29);
3274
3326
  }
3275
3327
  }
3276
3328
  if (s1 !== peg$FAILED) {
@@ -3304,13 +3356,13 @@ function peg$parse(input, options) {
3304
3356
  var s0, s1, s2, s3;
3305
3357
  s0 = peg$currPos;
3306
3358
  s1 = input.substr(peg$currPos, 6);
3307
- if (s1.toLowerCase() === peg$c22) {
3359
+ if (s1.toLowerCase() === peg$c23) {
3308
3360
  peg$currPos += 6;
3309
3361
  }
3310
3362
  else {
3311
3363
  s1 = peg$FAILED;
3312
3364
  if (peg$silentFails === 0) {
3313
- peg$fail(peg$e29);
3365
+ peg$fail(peg$e30);
3314
3366
  }
3315
3367
  }
3316
3368
  if (s1 !== peg$FAILED) {
@@ -3344,13 +3396,13 @@ function peg$parse(input, options) {
3344
3396
  var s0, s1, s2, s3;
3345
3397
  s0 = peg$currPos;
3346
3398
  s1 = input.substr(peg$currPos, 5);
3347
- if (s1.toLowerCase() === peg$c23) {
3399
+ if (s1.toLowerCase() === peg$c24) {
3348
3400
  peg$currPos += 5;
3349
3401
  }
3350
3402
  else {
3351
3403
  s1 = peg$FAILED;
3352
3404
  if (peg$silentFails === 0) {
3353
- peg$fail(peg$e30);
3405
+ peg$fail(peg$e31);
3354
3406
  }
3355
3407
  }
3356
3408
  if (s1 !== peg$FAILED) {
@@ -3384,13 +3436,13 @@ function peg$parse(input, options) {
3384
3436
  var s0, s1, s2, s3;
3385
3437
  s0 = peg$currPos;
3386
3438
  s1 = input.substr(peg$currPos, 7);
3387
- if (s1.toLowerCase() === peg$c24) {
3439
+ if (s1.toLowerCase() === peg$c25) {
3388
3440
  peg$currPos += 7;
3389
3441
  }
3390
3442
  else {
3391
3443
  s1 = peg$FAILED;
3392
3444
  if (peg$silentFails === 0) {
3393
- peg$fail(peg$e31);
3445
+ peg$fail(peg$e32);
3394
3446
  }
3395
3447
  }
3396
3448
  if (s1 !== peg$FAILED) {
@@ -3424,13 +3476,13 @@ function peg$parse(input, options) {
3424
3476
  var s0, s1, s2, s3;
3425
3477
  s0 = peg$currPos;
3426
3478
  s1 = input.substr(peg$currPos, 8);
3427
- if (s1.toLowerCase() === peg$c25) {
3479
+ if (s1.toLowerCase() === peg$c26) {
3428
3480
  peg$currPos += 8;
3429
3481
  }
3430
3482
  else {
3431
3483
  s1 = peg$FAILED;
3432
3484
  if (peg$silentFails === 0) {
3433
- peg$fail(peg$e32);
3485
+ peg$fail(peg$e33);
3434
3486
  }
3435
3487
  }
3436
3488
  if (s1 !== peg$FAILED) {
@@ -3464,13 +3516,13 @@ function peg$parse(input, options) {
3464
3516
  var s0, s1, s2, s3;
3465
3517
  s0 = peg$currPos;
3466
3518
  s1 = input.substr(peg$currPos, 3);
3467
- if (s1.toLowerCase() === peg$c26) {
3519
+ if (s1.toLowerCase() === peg$c27) {
3468
3520
  peg$currPos += 3;
3469
3521
  }
3470
3522
  else {
3471
3523
  s1 = peg$FAILED;
3472
3524
  if (peg$silentFails === 0) {
3473
- peg$fail(peg$e33);
3525
+ peg$fail(peg$e34);
3474
3526
  }
3475
3527
  }
3476
3528
  if (s1 !== peg$FAILED) {
@@ -3504,13 +3556,13 @@ function peg$parse(input, options) {
3504
3556
  var s0, s1, s2, s3;
3505
3557
  s0 = peg$currPos;
3506
3558
  s1 = input.substr(peg$currPos, 5);
3507
- if (s1.toLowerCase() === peg$c27) {
3559
+ if (s1.toLowerCase() === peg$c28) {
3508
3560
  peg$currPos += 5;
3509
3561
  }
3510
3562
  else {
3511
3563
  s1 = peg$FAILED;
3512
3564
  if (peg$silentFails === 0) {
3513
- peg$fail(peg$e34);
3565
+ peg$fail(peg$e35);
3514
3566
  }
3515
3567
  }
3516
3568
  if (s1 !== peg$FAILED) {
@@ -3544,13 +3596,13 @@ function peg$parse(input, options) {
3544
3596
  var s0, s1, s2, s3;
3545
3597
  s0 = peg$currPos;
3546
3598
  s1 = input.substr(peg$currPos, 9);
3547
- if (s1.toLowerCase() === peg$c28) {
3599
+ if (s1.toLowerCase() === peg$c29) {
3548
3600
  peg$currPos += 9;
3549
3601
  }
3550
3602
  else {
3551
3603
  s1 = peg$FAILED;
3552
3604
  if (peg$silentFails === 0) {
3553
- peg$fail(peg$e35);
3605
+ peg$fail(peg$e36);
3554
3606
  }
3555
3607
  }
3556
3608
  if (s1 !== peg$FAILED) {
@@ -3584,13 +3636,13 @@ function peg$parse(input, options) {
3584
3636
  var s0, s1, s2, s3;
3585
3637
  s0 = peg$currPos;
3586
3638
  s1 = input.substr(peg$currPos, 8);
3587
- if (s1.toLowerCase() === peg$c29) {
3639
+ if (s1.toLowerCase() === peg$c30) {
3588
3640
  peg$currPos += 8;
3589
3641
  }
3590
3642
  else {
3591
3643
  s1 = peg$FAILED;
3592
3644
  if (peg$silentFails === 0) {
3593
- peg$fail(peg$e36);
3645
+ peg$fail(peg$e37);
3594
3646
  }
3595
3647
  }
3596
3648
  if (s1 !== peg$FAILED) {
@@ -3624,13 +3676,13 @@ function peg$parse(input, options) {
3624
3676
  var s0, s1, s2, s3;
3625
3677
  s0 = peg$currPos;
3626
3678
  s1 = input.substr(peg$currPos, 3);
3627
- if (s1.toLowerCase() === peg$c30) {
3679
+ if (s1.toLowerCase() === peg$c31) {
3628
3680
  peg$currPos += 3;
3629
3681
  }
3630
3682
  else {
3631
3683
  s1 = peg$FAILED;
3632
3684
  if (peg$silentFails === 0) {
3633
- peg$fail(peg$e37);
3685
+ peg$fail(peg$e38);
3634
3686
  }
3635
3687
  }
3636
3688
  if (s1 !== peg$FAILED) {
@@ -3664,13 +3716,13 @@ function peg$parse(input, options) {
3664
3716
  var s0, s1, s2, s3;
3665
3717
  s0 = peg$currPos;
3666
3718
  s1 = input.substr(peg$currPos, 2);
3667
- if (s1.toLowerCase() === peg$c31) {
3719
+ if (s1.toLowerCase() === peg$c32) {
3668
3720
  peg$currPos += 2;
3669
3721
  }
3670
3722
  else {
3671
3723
  s1 = peg$FAILED;
3672
3724
  if (peg$silentFails === 0) {
3673
- peg$fail(peg$e38);
3725
+ peg$fail(peg$e39);
3674
3726
  }
3675
3727
  }
3676
3728
  if (s1 !== peg$FAILED) {
@@ -3704,13 +3756,13 @@ function peg$parse(input, options) {
3704
3756
  var s0, s1, s2, s3;
3705
3757
  s0 = peg$currPos;
3706
3758
  s1 = input.substr(peg$currPos, 6);
3707
- if (s1.toLowerCase() === peg$c32) {
3759
+ if (s1.toLowerCase() === peg$c33) {
3708
3760
  peg$currPos += 6;
3709
3761
  }
3710
3762
  else {
3711
3763
  s1 = peg$FAILED;
3712
3764
  if (peg$silentFails === 0) {
3713
- peg$fail(peg$e39);
3765
+ peg$fail(peg$e40);
3714
3766
  }
3715
3767
  }
3716
3768
  if (s1 !== peg$FAILED) {
@@ -3744,13 +3796,13 @@ function peg$parse(input, options) {
3744
3796
  var s0, s1, s2, s3;
3745
3797
  s0 = peg$currPos;
3746
3798
  s1 = input.substr(peg$currPos, 7);
3747
- if (s1.toLowerCase() === peg$c33) {
3799
+ if (s1.toLowerCase() === peg$c34) {
3748
3800
  peg$currPos += 7;
3749
3801
  }
3750
3802
  else {
3751
3803
  s1 = peg$FAILED;
3752
3804
  if (peg$silentFails === 0) {
3753
- peg$fail(peg$e40);
3805
+ peg$fail(peg$e41);
3754
3806
  }
3755
3807
  }
3756
3808
  if (s1 !== peg$FAILED) {
@@ -3784,13 +3836,13 @@ function peg$parse(input, options) {
3784
3836
  var s0, s1, s2, s3;
3785
3837
  s0 = peg$currPos;
3786
3838
  s1 = input.substr(peg$currPos, 9);
3787
- if (s1.toLowerCase() === peg$c34) {
3839
+ if (s1.toLowerCase() === peg$c35) {
3788
3840
  peg$currPos += 9;
3789
3841
  }
3790
3842
  else {
3791
3843
  s1 = peg$FAILED;
3792
3844
  if (peg$silentFails === 0) {
3793
- peg$fail(peg$e41);
3845
+ peg$fail(peg$e42);
3794
3846
  }
3795
3847
  }
3796
3848
  if (s1 !== peg$FAILED) {
@@ -3824,13 +3876,13 @@ function peg$parse(input, options) {
3824
3876
  var s0, s1, s2, s3;
3825
3877
  s0 = peg$currPos;
3826
3878
  s1 = input.substr(peg$currPos, 8);
3827
- if (s1.toLowerCase() === peg$c35) {
3879
+ if (s1.toLowerCase() === peg$c36) {
3828
3880
  peg$currPos += 8;
3829
3881
  }
3830
3882
  else {
3831
3883
  s1 = peg$FAILED;
3832
3884
  if (peg$silentFails === 0) {
3833
- peg$fail(peg$e42);
3885
+ peg$fail(peg$e43);
3834
3886
  }
3835
3887
  }
3836
3888
  if (s1 !== peg$FAILED) {
@@ -3864,13 +3916,13 @@ function peg$parse(input, options) {
3864
3916
  var s0, s1, s2, s3;
3865
3917
  s0 = peg$currPos;
3866
3918
  s1 = input.substr(peg$currPos, 6);
3867
- if (s1.toLowerCase() === peg$c36) {
3919
+ if (s1.toLowerCase() === peg$c37) {
3868
3920
  peg$currPos += 6;
3869
3921
  }
3870
3922
  else {
3871
3923
  s1 = peg$FAILED;
3872
3924
  if (peg$silentFails === 0) {
3873
- peg$fail(peg$e43);
3925
+ peg$fail(peg$e44);
3874
3926
  }
3875
3927
  }
3876
3928
  if (s1 !== peg$FAILED) {
@@ -3904,13 +3956,13 @@ function peg$parse(input, options) {
3904
3956
  var s0, s1, s2, s3;
3905
3957
  s0 = peg$currPos;
3906
3958
  s1 = input.substr(peg$currPos, 8);
3907
- if (s1.toLowerCase() === peg$c37) {
3959
+ if (s1.toLowerCase() === peg$c38) {
3908
3960
  peg$currPos += 8;
3909
3961
  }
3910
3962
  else {
3911
3963
  s1 = peg$FAILED;
3912
3964
  if (peg$silentFails === 0) {
3913
- peg$fail(peg$e44);
3965
+ peg$fail(peg$e45);
3914
3966
  }
3915
3967
  }
3916
3968
  if (s1 !== peg$FAILED) {
@@ -3944,13 +3996,13 @@ function peg$parse(input, options) {
3944
3996
  var s0, s1, s2, s3;
3945
3997
  s0 = peg$currPos;
3946
3998
  s1 = input.substr(peg$currPos, 6);
3947
- if (s1.toLowerCase() === peg$c38) {
3999
+ if (s1.toLowerCase() === peg$c39) {
3948
4000
  peg$currPos += 6;
3949
4001
  }
3950
4002
  else {
3951
4003
  s1 = peg$FAILED;
3952
4004
  if (peg$silentFails === 0) {
3953
- peg$fail(peg$e45);
4005
+ peg$fail(peg$e46);
3954
4006
  }
3955
4007
  }
3956
4008
  if (s1 !== peg$FAILED) {
@@ -3989,7 +4041,7 @@ function peg$parse(input, options) {
3989
4041
  else {
3990
4042
  s0 = peg$FAILED;
3991
4043
  if (peg$silentFails === 0) {
3992
- peg$fail(peg$e46);
4044
+ peg$fail(peg$e47);
3993
4045
  }
3994
4046
  }
3995
4047
  return s0;
@@ -4005,7 +4057,7 @@ function peg$parse(input, options) {
4005
4057
  else {
4006
4058
  s1 = peg$FAILED;
4007
4059
  if (peg$silentFails === 0) {
4008
- peg$fail(peg$e48);
4060
+ peg$fail(peg$e49);
4009
4061
  }
4010
4062
  }
4011
4063
  while (s1 !== peg$FAILED) {
@@ -4017,14 +4069,14 @@ function peg$parse(input, options) {
4017
4069
  else {
4018
4070
  s1 = peg$FAILED;
4019
4071
  if (peg$silentFails === 0) {
4020
- peg$fail(peg$e48);
4072
+ peg$fail(peg$e49);
4021
4073
  }
4022
4074
  }
4023
4075
  }
4024
4076
  peg$silentFails--;
4025
4077
  s1 = peg$FAILED;
4026
4078
  if (peg$silentFails === 0) {
4027
- peg$fail(peg$e47);
4079
+ peg$fail(peg$e48);
4028
4080
  }
4029
4081
  return s0;
4030
4082
  }
@@ -4039,7 +4091,7 @@ function peg$parse(input, options) {
4039
4091
  else {
4040
4092
  s1 = peg$FAILED;
4041
4093
  if (peg$silentFails === 0) {
4042
- peg$fail(peg$e48);
4094
+ peg$fail(peg$e49);
4043
4095
  }
4044
4096
  }
4045
4097
  if (s1 !== peg$FAILED) {
@@ -4052,7 +4104,7 @@ function peg$parse(input, options) {
4052
4104
  else {
4053
4105
  s1 = peg$FAILED;
4054
4106
  if (peg$silentFails === 0) {
4055
- peg$fail(peg$e48);
4107
+ peg$fail(peg$e49);
4056
4108
  }
4057
4109
  }
4058
4110
  }
@@ -4064,7 +4116,7 @@ function peg$parse(input, options) {
4064
4116
  if (s0 === peg$FAILED) {
4065
4117
  s1 = peg$FAILED;
4066
4118
  if (peg$silentFails === 0) {
4067
- peg$fail(peg$e49);
4119
+ peg$fail(peg$e50);
4068
4120
  }
4069
4121
  }
4070
4122
  return s0;