@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.
- package/dist/boolean_filter_expression.js +4 -1
- package/dist/boolean_filter_expression.js.map +1 -1
- package/dist/clause_utils.js +4 -1
- package/dist/clause_utils.js.map +1 -1
- package/dist/filter_interface.d.ts +6 -4
- package/dist/filter_interface.js +4 -1
- package/dist/filter_interface.js.map +1 -1
- package/dist/lib/fexpr_number_parser.js +283 -231
- package/dist/lib/fexpr_number_parser.js.map +1 -1
- package/dist/lib/ftemporal_parser.js +305 -253
- package/dist/lib/ftemporal_parser.js.map +1 -1
- package/dist/number_filter_expression.js +3 -0
- package/dist/number_filter_expression.js.map +1 -1
- package/dist/string_filter_expression.js +2 -0
- package/dist/string_filter_expression.js.map +1 -1
- package/dist/temporal_filter_expression.js +3 -1
- package/dist/temporal_filter_expression.js.map +1 -1
- package/package.json +1 -1
- package/src/boolean_filter_expression.ts +3 -1
- package/src/clause_utils.ts +4 -1
- package/src/filter_interface.ts +13 -2
- package/src/grammars/fexpr_number.peggy +2 -0
- package/src/grammars/ftemporal.peggy +2 -0
- package/src/lib/fexpr_number_parser.js +252 -203
- package/src/lib/ftemporal_parser.js +291 -242
- package/src/number_filter_expression.ts +3 -0
- package/src/string_filter_expression.ts +2 -0
- package/src/temporal_filter_expression.ts +6 -1
|
@@ -193,9 +193,10 @@ function peg$parse(input, options) {
|
|
|
193
193
|
var peg$c10 = ".";
|
|
194
194
|
var peg$c11 = "not";
|
|
195
195
|
var peg$c12 = "null";
|
|
196
|
-
var peg$c13 = "
|
|
197
|
-
var peg$c14 = "
|
|
198
|
-
var peg$c15 = "
|
|
196
|
+
var peg$c13 = "none";
|
|
197
|
+
var peg$c14 = "and";
|
|
198
|
+
var peg$c15 = "or";
|
|
199
|
+
var peg$c16 = "to";
|
|
199
200
|
|
|
200
201
|
var peg$r0 = /^[<>]/;
|
|
201
202
|
var peg$r1 = /^[0-9]/;
|
|
@@ -221,12 +222,13 @@ function peg$parse(input, options) {
|
|
|
221
222
|
var peg$e14 = peg$classExpectation(["+", "-"], false, false);
|
|
222
223
|
var peg$e15 = peg$literalExpectation("not", true);
|
|
223
224
|
var peg$e16 = peg$literalExpectation("null", true);
|
|
224
|
-
var peg$e17 = peg$literalExpectation("
|
|
225
|
-
var peg$e18 = peg$literalExpectation("
|
|
226
|
-
var peg$e19 = peg$literalExpectation("
|
|
227
|
-
var peg$e20 = peg$
|
|
228
|
-
var peg$e21 = peg$
|
|
229
|
-
var peg$e22 = peg$
|
|
225
|
+
var peg$e17 = peg$literalExpectation("none", true);
|
|
226
|
+
var peg$e18 = peg$literalExpectation("and", true);
|
|
227
|
+
var peg$e19 = peg$literalExpectation("or", true);
|
|
228
|
+
var peg$e20 = peg$literalExpectation("to", true);
|
|
229
|
+
var peg$e21 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false);
|
|
230
|
+
var peg$e22 = peg$otherExpectation("whitespace");
|
|
231
|
+
var peg$e23 = peg$classExpectation([" ", "\t"], false, false);
|
|
230
232
|
|
|
231
233
|
var peg$f0 = function(head, tail) {
|
|
232
234
|
return tail.reduce((left, [, cop, , right]) => joinNumbers(left, cop, right), head);
|
|
@@ -234,20 +236,21 @@ function peg$parse(input, options) {
|
|
|
234
236
|
var peg$f1 = function(not, clause) { return numNot(clause, not); };
|
|
235
237
|
var peg$f2 = function(clause) { return clause; };
|
|
236
238
|
var peg$f3 = function() { return {operator: 'null'}; };
|
|
237
|
-
var peg$f4 = function(
|
|
238
|
-
var peg$f5 = function(
|
|
239
|
-
var peg$f6 = function(
|
|
240
|
-
var peg$f7 = function(n, nList) { return {operator: '
|
|
241
|
-
var peg$f8 = function(
|
|
242
|
-
var peg$f9 = function(
|
|
243
|
-
var peg$f10 = function() { return
|
|
244
|
-
var peg$f11 = function() { return "
|
|
245
|
-
var peg$f12 = function() { return "
|
|
246
|
-
var peg$f13 = function() { return "
|
|
247
|
-
var peg$f14 = function(
|
|
248
|
-
var peg$f15 = function() { return
|
|
249
|
-
var peg$f16 = function() { return "
|
|
250
|
-
var peg$f17 = function() { return "
|
|
239
|
+
var peg$f4 = function() { return {operator: 'none'}; };
|
|
240
|
+
var peg$f5 = function(expr) { return {operator: "()", expr}; };
|
|
241
|
+
var peg$f6 = function(open, b, e, close) { return mkRange(open, b, e, close); };
|
|
242
|
+
var peg$f7 = function(n, nList) { return {operator: '!=', ...mkValues(n, nList.map(x => x[3]))}; };
|
|
243
|
+
var peg$f8 = function(n, nList) { return {operator: '=', ...mkValues(n, nList.map(x => x[3]))}; };
|
|
244
|
+
var peg$f9 = function(op, n) { return {operator: op, values: [n]}; };
|
|
245
|
+
var peg$f10 = function(n, nList) { return {operator: '=', ...mkValues(n, nList.map(x => x[3]))}; };
|
|
246
|
+
var peg$f11 = function() { return "["; };
|
|
247
|
+
var peg$f12 = function() { return "("; };
|
|
248
|
+
var peg$f13 = function() { return "]"; };
|
|
249
|
+
var peg$f14 = function() { return ")"; };
|
|
250
|
+
var peg$f15 = function(n) { return n; };
|
|
251
|
+
var peg$f16 = function() { return "or"; };
|
|
252
|
+
var peg$f17 = function() { return "and"; };
|
|
253
|
+
var peg$f18 = function() { return "not"; };
|
|
251
254
|
var peg$currPos = options.peg$currPos | 0;
|
|
252
255
|
var peg$savedPos = peg$currPos;
|
|
253
256
|
var peg$posDetailsCache = [{ line: 1, column: 1 }];
|
|
@@ -508,66 +511,36 @@ function peg$parse(input, options) {
|
|
|
508
511
|
s0 = s1;
|
|
509
512
|
if (s0 === peg$FAILED) {
|
|
510
513
|
s0 = peg$currPos;
|
|
511
|
-
|
|
512
|
-
s1 = peg$c0;
|
|
513
|
-
peg$currPos++;
|
|
514
|
-
} else {
|
|
515
|
-
s1 = peg$FAILED;
|
|
516
|
-
if (peg$silentFails === 0) { peg$fail(peg$e0); }
|
|
517
|
-
}
|
|
514
|
+
s1 = peg$parseNONE();
|
|
518
515
|
if (s1 !== peg$FAILED) {
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
if (s3 !== peg$FAILED) {
|
|
522
|
-
s4 = peg$parse_();
|
|
523
|
-
if (input.charCodeAt(peg$currPos) === 41) {
|
|
524
|
-
s5 = peg$c1;
|
|
525
|
-
peg$currPos++;
|
|
526
|
-
} else {
|
|
527
|
-
s5 = peg$FAILED;
|
|
528
|
-
if (peg$silentFails === 0) { peg$fail(peg$e1); }
|
|
529
|
-
}
|
|
530
|
-
if (s5 !== peg$FAILED) {
|
|
531
|
-
peg$savedPos = s0;
|
|
532
|
-
s0 = peg$f4(s3);
|
|
533
|
-
} else {
|
|
534
|
-
peg$currPos = s0;
|
|
535
|
-
s0 = peg$FAILED;
|
|
536
|
-
}
|
|
537
|
-
} else {
|
|
538
|
-
peg$currPos = s0;
|
|
539
|
-
s0 = peg$FAILED;
|
|
540
|
-
}
|
|
541
|
-
} else {
|
|
542
|
-
peg$currPos = s0;
|
|
543
|
-
s0 = peg$FAILED;
|
|
516
|
+
peg$savedPos = s0;
|
|
517
|
+
s1 = peg$f4();
|
|
544
518
|
}
|
|
519
|
+
s0 = s1;
|
|
545
520
|
if (s0 === peg$FAILED) {
|
|
546
521
|
s0 = peg$currPos;
|
|
547
|
-
|
|
522
|
+
if (input.charCodeAt(peg$currPos) === 40) {
|
|
523
|
+
s1 = peg$c0;
|
|
524
|
+
peg$currPos++;
|
|
525
|
+
} else {
|
|
526
|
+
s1 = peg$FAILED;
|
|
527
|
+
if (peg$silentFails === 0) { peg$fail(peg$e0); }
|
|
528
|
+
}
|
|
548
529
|
if (s1 !== peg$FAILED) {
|
|
549
530
|
s2 = peg$parse_();
|
|
550
|
-
s3 = peg$
|
|
531
|
+
s3 = peg$parsenumberFilter();
|
|
551
532
|
if (s3 !== peg$FAILED) {
|
|
552
533
|
s4 = peg$parse_();
|
|
553
|
-
|
|
534
|
+
if (input.charCodeAt(peg$currPos) === 41) {
|
|
535
|
+
s5 = peg$c1;
|
|
536
|
+
peg$currPos++;
|
|
537
|
+
} else {
|
|
538
|
+
s5 = peg$FAILED;
|
|
539
|
+
if (peg$silentFails === 0) { peg$fail(peg$e1); }
|
|
540
|
+
}
|
|
554
541
|
if (s5 !== peg$FAILED) {
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
if (s7 !== peg$FAILED) {
|
|
558
|
-
s8 = peg$parse_();
|
|
559
|
-
s9 = peg$parsecloseInterval();
|
|
560
|
-
if (s9 !== peg$FAILED) {
|
|
561
|
-
peg$savedPos = s0;
|
|
562
|
-
s0 = peg$f5(s1, s3, s7, s9);
|
|
563
|
-
} else {
|
|
564
|
-
peg$currPos = s0;
|
|
565
|
-
s0 = peg$FAILED;
|
|
566
|
-
}
|
|
567
|
-
} else {
|
|
568
|
-
peg$currPos = s0;
|
|
569
|
-
s0 = peg$FAILED;
|
|
570
|
-
}
|
|
542
|
+
peg$savedPos = s0;
|
|
543
|
+
s0 = peg$f5(s3);
|
|
571
544
|
} else {
|
|
572
545
|
peg$currPos = s0;
|
|
573
546
|
s0 = peg$FAILED;
|
|
@@ -582,69 +555,34 @@ function peg$parse(input, options) {
|
|
|
582
555
|
}
|
|
583
556
|
if (s0 === peg$FAILED) {
|
|
584
557
|
s0 = peg$currPos;
|
|
585
|
-
|
|
586
|
-
s1 = peg$c2;
|
|
587
|
-
peg$currPos += 2;
|
|
588
|
-
} else {
|
|
589
|
-
s1 = peg$FAILED;
|
|
590
|
-
if (peg$silentFails === 0) { peg$fail(peg$e2); }
|
|
591
|
-
}
|
|
558
|
+
s1 = peg$parseopenInterval();
|
|
592
559
|
if (s1 !== peg$FAILED) {
|
|
593
560
|
s2 = peg$parse_();
|
|
594
561
|
s3 = peg$parseN();
|
|
595
562
|
if (s3 !== peg$FAILED) {
|
|
596
|
-
s4 =
|
|
597
|
-
s5 = peg$
|
|
598
|
-
|
|
599
|
-
if (input.charCodeAt(peg$currPos) === 44) {
|
|
600
|
-
s7 = peg$c3;
|
|
601
|
-
peg$currPos++;
|
|
602
|
-
} else {
|
|
603
|
-
s7 = peg$FAILED;
|
|
604
|
-
if (peg$silentFails === 0) { peg$fail(peg$e3); }
|
|
605
|
-
}
|
|
606
|
-
if (s7 !== peg$FAILED) {
|
|
607
|
-
s8 = peg$parse_();
|
|
608
|
-
s9 = peg$parseN();
|
|
609
|
-
if (s9 !== peg$FAILED) {
|
|
610
|
-
s6 = [s6, s7, s8, s9];
|
|
611
|
-
s5 = s6;
|
|
612
|
-
} else {
|
|
613
|
-
peg$currPos = s5;
|
|
614
|
-
s5 = peg$FAILED;
|
|
615
|
-
}
|
|
616
|
-
} else {
|
|
617
|
-
peg$currPos = s5;
|
|
618
|
-
s5 = peg$FAILED;
|
|
619
|
-
}
|
|
620
|
-
while (s5 !== peg$FAILED) {
|
|
621
|
-
s4.push(s5);
|
|
622
|
-
s5 = peg$currPos;
|
|
563
|
+
s4 = peg$parse_();
|
|
564
|
+
s5 = peg$parseTO();
|
|
565
|
+
if (s5 !== peg$FAILED) {
|
|
623
566
|
s6 = peg$parse_();
|
|
624
|
-
|
|
625
|
-
s7 = peg$c3;
|
|
626
|
-
peg$currPos++;
|
|
627
|
-
} else {
|
|
628
|
-
s7 = peg$FAILED;
|
|
629
|
-
if (peg$silentFails === 0) { peg$fail(peg$e3); }
|
|
630
|
-
}
|
|
567
|
+
s7 = peg$parseN();
|
|
631
568
|
if (s7 !== peg$FAILED) {
|
|
632
569
|
s8 = peg$parse_();
|
|
633
|
-
s9 = peg$
|
|
570
|
+
s9 = peg$parsecloseInterval();
|
|
634
571
|
if (s9 !== peg$FAILED) {
|
|
635
|
-
|
|
636
|
-
|
|
572
|
+
peg$savedPos = s0;
|
|
573
|
+
s0 = peg$f6(s1, s3, s7, s9);
|
|
637
574
|
} else {
|
|
638
|
-
peg$currPos =
|
|
639
|
-
|
|
575
|
+
peg$currPos = s0;
|
|
576
|
+
s0 = peg$FAILED;
|
|
640
577
|
}
|
|
641
578
|
} else {
|
|
642
|
-
peg$currPos =
|
|
643
|
-
|
|
579
|
+
peg$currPos = s0;
|
|
580
|
+
s0 = peg$FAILED;
|
|
644
581
|
}
|
|
582
|
+
} else {
|
|
583
|
+
peg$currPos = s0;
|
|
584
|
+
s0 = peg$FAILED;
|
|
645
585
|
}
|
|
646
|
-
peg$savedPos = s0;
|
|
647
|
-
s0 = peg$f6(s3, s4);
|
|
648
586
|
} else {
|
|
649
587
|
peg$currPos = s0;
|
|
650
588
|
s0 = peg$FAILED;
|
|
@@ -655,12 +593,12 @@ function peg$parse(input, options) {
|
|
|
655
593
|
}
|
|
656
594
|
if (s0 === peg$FAILED) {
|
|
657
595
|
s0 = peg$currPos;
|
|
658
|
-
if (input.
|
|
659
|
-
s1 = peg$
|
|
660
|
-
peg$currPos
|
|
596
|
+
if (input.substr(peg$currPos, 2) === peg$c2) {
|
|
597
|
+
s1 = peg$c2;
|
|
598
|
+
peg$currPos += 2;
|
|
661
599
|
} else {
|
|
662
600
|
s1 = peg$FAILED;
|
|
663
|
-
if (peg$silentFails === 0) { peg$fail(peg$
|
|
601
|
+
if (peg$silentFails === 0) { peg$fail(peg$e2); }
|
|
664
602
|
}
|
|
665
603
|
if (s1 !== peg$FAILED) {
|
|
666
604
|
s2 = peg$parse_();
|
|
@@ -728,43 +666,69 @@ function peg$parse(input, options) {
|
|
|
728
666
|
}
|
|
729
667
|
if (s0 === peg$FAILED) {
|
|
730
668
|
s0 = peg$currPos;
|
|
731
|
-
|
|
732
|
-
|
|
733
|
-
|
|
734
|
-
peg$currPos += 2;
|
|
735
|
-
} else {
|
|
736
|
-
s2 = peg$FAILED;
|
|
737
|
-
if (peg$silentFails === 0) { peg$fail(peg$e5); }
|
|
738
|
-
}
|
|
739
|
-
if (s2 === peg$FAILED) {
|
|
740
|
-
if (input.substr(peg$currPos, 2) === peg$c6) {
|
|
741
|
-
s2 = peg$c6;
|
|
742
|
-
peg$currPos += 2;
|
|
743
|
-
} else {
|
|
744
|
-
s2 = peg$FAILED;
|
|
745
|
-
if (peg$silentFails === 0) { peg$fail(peg$e6); }
|
|
746
|
-
}
|
|
747
|
-
if (s2 === peg$FAILED) {
|
|
748
|
-
s2 = input.charAt(peg$currPos);
|
|
749
|
-
if (peg$r0.test(s2)) {
|
|
750
|
-
peg$currPos++;
|
|
751
|
-
} else {
|
|
752
|
-
s2 = peg$FAILED;
|
|
753
|
-
if (peg$silentFails === 0) { peg$fail(peg$e7); }
|
|
754
|
-
}
|
|
755
|
-
}
|
|
756
|
-
}
|
|
757
|
-
if (s2 !== peg$FAILED) {
|
|
758
|
-
s1 = input.substring(s1, peg$currPos);
|
|
669
|
+
if (input.charCodeAt(peg$currPos) === 61) {
|
|
670
|
+
s1 = peg$c4;
|
|
671
|
+
peg$currPos++;
|
|
759
672
|
} else {
|
|
760
|
-
s1 =
|
|
673
|
+
s1 = peg$FAILED;
|
|
674
|
+
if (peg$silentFails === 0) { peg$fail(peg$e4); }
|
|
761
675
|
}
|
|
762
676
|
if (s1 !== peg$FAILED) {
|
|
763
677
|
s2 = peg$parse_();
|
|
764
678
|
s3 = peg$parseN();
|
|
765
679
|
if (s3 !== peg$FAILED) {
|
|
680
|
+
s4 = [];
|
|
681
|
+
s5 = peg$currPos;
|
|
682
|
+
s6 = peg$parse_();
|
|
683
|
+
if (input.charCodeAt(peg$currPos) === 44) {
|
|
684
|
+
s7 = peg$c3;
|
|
685
|
+
peg$currPos++;
|
|
686
|
+
} else {
|
|
687
|
+
s7 = peg$FAILED;
|
|
688
|
+
if (peg$silentFails === 0) { peg$fail(peg$e3); }
|
|
689
|
+
}
|
|
690
|
+
if (s7 !== peg$FAILED) {
|
|
691
|
+
s8 = peg$parse_();
|
|
692
|
+
s9 = peg$parseN();
|
|
693
|
+
if (s9 !== peg$FAILED) {
|
|
694
|
+
s6 = [s6, s7, s8, s9];
|
|
695
|
+
s5 = s6;
|
|
696
|
+
} else {
|
|
697
|
+
peg$currPos = s5;
|
|
698
|
+
s5 = peg$FAILED;
|
|
699
|
+
}
|
|
700
|
+
} else {
|
|
701
|
+
peg$currPos = s5;
|
|
702
|
+
s5 = peg$FAILED;
|
|
703
|
+
}
|
|
704
|
+
while (s5 !== peg$FAILED) {
|
|
705
|
+
s4.push(s5);
|
|
706
|
+
s5 = peg$currPos;
|
|
707
|
+
s6 = peg$parse_();
|
|
708
|
+
if (input.charCodeAt(peg$currPos) === 44) {
|
|
709
|
+
s7 = peg$c3;
|
|
710
|
+
peg$currPos++;
|
|
711
|
+
} else {
|
|
712
|
+
s7 = peg$FAILED;
|
|
713
|
+
if (peg$silentFails === 0) { peg$fail(peg$e3); }
|
|
714
|
+
}
|
|
715
|
+
if (s7 !== peg$FAILED) {
|
|
716
|
+
s8 = peg$parse_();
|
|
717
|
+
s9 = peg$parseN();
|
|
718
|
+
if (s9 !== peg$FAILED) {
|
|
719
|
+
s6 = [s6, s7, s8, s9];
|
|
720
|
+
s5 = s6;
|
|
721
|
+
} else {
|
|
722
|
+
peg$currPos = s5;
|
|
723
|
+
s5 = peg$FAILED;
|
|
724
|
+
}
|
|
725
|
+
} else {
|
|
726
|
+
peg$currPos = s5;
|
|
727
|
+
s5 = peg$FAILED;
|
|
728
|
+
}
|
|
729
|
+
}
|
|
766
730
|
peg$savedPos = s0;
|
|
767
|
-
s0 = peg$f8(
|
|
731
|
+
s0 = peg$f8(s3, s4);
|
|
768
732
|
} else {
|
|
769
733
|
peg$currPos = s0;
|
|
770
734
|
s0 = peg$FAILED;
|
|
@@ -775,34 +739,56 @@ function peg$parse(input, options) {
|
|
|
775
739
|
}
|
|
776
740
|
if (s0 === peg$FAILED) {
|
|
777
741
|
s0 = peg$currPos;
|
|
778
|
-
s1 = peg$
|
|
779
|
-
if (
|
|
780
|
-
s2 =
|
|
781
|
-
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
|
|
742
|
+
s1 = peg$currPos;
|
|
743
|
+
if (input.substr(peg$currPos, 2) === peg$c5) {
|
|
744
|
+
s2 = peg$c5;
|
|
745
|
+
peg$currPos += 2;
|
|
746
|
+
} else {
|
|
747
|
+
s2 = peg$FAILED;
|
|
748
|
+
if (peg$silentFails === 0) { peg$fail(peg$e5); }
|
|
749
|
+
}
|
|
750
|
+
if (s2 === peg$FAILED) {
|
|
751
|
+
if (input.substr(peg$currPos, 2) === peg$c6) {
|
|
752
|
+
s2 = peg$c6;
|
|
753
|
+
peg$currPos += 2;
|
|
786
754
|
} else {
|
|
787
|
-
|
|
788
|
-
if (peg$silentFails === 0) { peg$fail(peg$
|
|
755
|
+
s2 = peg$FAILED;
|
|
756
|
+
if (peg$silentFails === 0) { peg$fail(peg$e6); }
|
|
789
757
|
}
|
|
790
|
-
if (
|
|
791
|
-
|
|
792
|
-
|
|
793
|
-
|
|
794
|
-
s4 = [s4, s5, s6, s7];
|
|
795
|
-
s3 = s4;
|
|
758
|
+
if (s2 === peg$FAILED) {
|
|
759
|
+
s2 = input.charAt(peg$currPos);
|
|
760
|
+
if (peg$r0.test(s2)) {
|
|
761
|
+
peg$currPos++;
|
|
796
762
|
} else {
|
|
797
|
-
|
|
798
|
-
|
|
763
|
+
s2 = peg$FAILED;
|
|
764
|
+
if (peg$silentFails === 0) { peg$fail(peg$e7); }
|
|
799
765
|
}
|
|
766
|
+
}
|
|
767
|
+
}
|
|
768
|
+
if (s2 !== peg$FAILED) {
|
|
769
|
+
s1 = input.substring(s1, peg$currPos);
|
|
770
|
+
} else {
|
|
771
|
+
s1 = s2;
|
|
772
|
+
}
|
|
773
|
+
if (s1 !== peg$FAILED) {
|
|
774
|
+
s2 = peg$parse_();
|
|
775
|
+
s3 = peg$parseN();
|
|
776
|
+
if (s3 !== peg$FAILED) {
|
|
777
|
+
peg$savedPos = s0;
|
|
778
|
+
s0 = peg$f9(s1, s3);
|
|
800
779
|
} else {
|
|
801
|
-
peg$currPos =
|
|
802
|
-
|
|
780
|
+
peg$currPos = s0;
|
|
781
|
+
s0 = peg$FAILED;
|
|
803
782
|
}
|
|
804
|
-
|
|
805
|
-
|
|
783
|
+
} else {
|
|
784
|
+
peg$currPos = s0;
|
|
785
|
+
s0 = peg$FAILED;
|
|
786
|
+
}
|
|
787
|
+
if (s0 === peg$FAILED) {
|
|
788
|
+
s0 = peg$currPos;
|
|
789
|
+
s1 = peg$parseN();
|
|
790
|
+
if (s1 !== peg$FAILED) {
|
|
791
|
+
s2 = [];
|
|
806
792
|
s3 = peg$currPos;
|
|
807
793
|
s4 = peg$parse_();
|
|
808
794
|
if (input.charCodeAt(peg$currPos) === 44) {
|
|
@@ -826,12 +812,38 @@ function peg$parse(input, options) {
|
|
|
826
812
|
peg$currPos = s3;
|
|
827
813
|
s3 = peg$FAILED;
|
|
828
814
|
}
|
|
815
|
+
while (s3 !== peg$FAILED) {
|
|
816
|
+
s2.push(s3);
|
|
817
|
+
s3 = peg$currPos;
|
|
818
|
+
s4 = peg$parse_();
|
|
819
|
+
if (input.charCodeAt(peg$currPos) === 44) {
|
|
820
|
+
s5 = peg$c3;
|
|
821
|
+
peg$currPos++;
|
|
822
|
+
} else {
|
|
823
|
+
s5 = peg$FAILED;
|
|
824
|
+
if (peg$silentFails === 0) { peg$fail(peg$e3); }
|
|
825
|
+
}
|
|
826
|
+
if (s5 !== peg$FAILED) {
|
|
827
|
+
s6 = peg$parse_();
|
|
828
|
+
s7 = peg$parseN();
|
|
829
|
+
if (s7 !== peg$FAILED) {
|
|
830
|
+
s4 = [s4, s5, s6, s7];
|
|
831
|
+
s3 = s4;
|
|
832
|
+
} else {
|
|
833
|
+
peg$currPos = s3;
|
|
834
|
+
s3 = peg$FAILED;
|
|
835
|
+
}
|
|
836
|
+
} else {
|
|
837
|
+
peg$currPos = s3;
|
|
838
|
+
s3 = peg$FAILED;
|
|
839
|
+
}
|
|
840
|
+
}
|
|
841
|
+
peg$savedPos = s0;
|
|
842
|
+
s0 = peg$f10(s1, s2);
|
|
843
|
+
} else {
|
|
844
|
+
peg$currPos = s0;
|
|
845
|
+
s0 = peg$FAILED;
|
|
829
846
|
}
|
|
830
|
-
peg$savedPos = s0;
|
|
831
|
-
s0 = peg$f9(s1, s2);
|
|
832
|
-
} else {
|
|
833
|
-
peg$currPos = s0;
|
|
834
|
-
s0 = peg$FAILED;
|
|
835
847
|
}
|
|
836
848
|
}
|
|
837
849
|
}
|
|
@@ -856,7 +868,7 @@ function peg$parse(input, options) {
|
|
|
856
868
|
}
|
|
857
869
|
if (s1 !== peg$FAILED) {
|
|
858
870
|
peg$savedPos = s0;
|
|
859
|
-
s1 = peg$
|
|
871
|
+
s1 = peg$f11();
|
|
860
872
|
}
|
|
861
873
|
s0 = s1;
|
|
862
874
|
if (s0 === peg$FAILED) {
|
|
@@ -870,7 +882,7 @@ function peg$parse(input, options) {
|
|
|
870
882
|
}
|
|
871
883
|
if (s1 !== peg$FAILED) {
|
|
872
884
|
peg$savedPos = s0;
|
|
873
|
-
s1 = peg$
|
|
885
|
+
s1 = peg$f12();
|
|
874
886
|
}
|
|
875
887
|
s0 = s1;
|
|
876
888
|
}
|
|
@@ -891,7 +903,7 @@ function peg$parse(input, options) {
|
|
|
891
903
|
}
|
|
892
904
|
if (s1 !== peg$FAILED) {
|
|
893
905
|
peg$savedPos = s0;
|
|
894
|
-
s1 = peg$
|
|
906
|
+
s1 = peg$f13();
|
|
895
907
|
}
|
|
896
908
|
s0 = s1;
|
|
897
909
|
if (s0 === peg$FAILED) {
|
|
@@ -905,7 +917,7 @@ function peg$parse(input, options) {
|
|
|
905
917
|
}
|
|
906
918
|
if (s1 !== peg$FAILED) {
|
|
907
919
|
peg$savedPos = s0;
|
|
908
|
-
s1 = peg$
|
|
920
|
+
s1 = peg$f14();
|
|
909
921
|
}
|
|
910
922
|
s0 = s1;
|
|
911
923
|
}
|
|
@@ -1118,7 +1130,7 @@ function peg$parse(input, options) {
|
|
|
1118
1130
|
}
|
|
1119
1131
|
if (s1 !== peg$FAILED) {
|
|
1120
1132
|
peg$savedPos = s0;
|
|
1121
|
-
s1 = peg$
|
|
1133
|
+
s1 = peg$f15(s1);
|
|
1122
1134
|
}
|
|
1123
1135
|
s0 = s1;
|
|
1124
1136
|
|
|
@@ -1132,7 +1144,7 @@ function peg$parse(input, options) {
|
|
|
1132
1144
|
s1 = peg$parseOR();
|
|
1133
1145
|
if (s1 !== peg$FAILED) {
|
|
1134
1146
|
peg$savedPos = s0;
|
|
1135
|
-
s1 = peg$
|
|
1147
|
+
s1 = peg$f16();
|
|
1136
1148
|
}
|
|
1137
1149
|
s0 = s1;
|
|
1138
1150
|
if (s0 === peg$FAILED) {
|
|
@@ -1140,7 +1152,7 @@ function peg$parse(input, options) {
|
|
|
1140
1152
|
s1 = peg$parseAND();
|
|
1141
1153
|
if (s1 !== peg$FAILED) {
|
|
1142
1154
|
peg$savedPos = s0;
|
|
1143
|
-
s1 = peg$
|
|
1155
|
+
s1 = peg$f17();
|
|
1144
1156
|
}
|
|
1145
1157
|
s0 = s1;
|
|
1146
1158
|
}
|
|
@@ -1172,7 +1184,7 @@ function peg$parse(input, options) {
|
|
|
1172
1184
|
}
|
|
1173
1185
|
if (s2 !== peg$FAILED) {
|
|
1174
1186
|
peg$savedPos = s0;
|
|
1175
|
-
s0 = peg$
|
|
1187
|
+
s0 = peg$f18();
|
|
1176
1188
|
} else {
|
|
1177
1189
|
peg$currPos = s0;
|
|
1178
1190
|
s0 = peg$FAILED;
|
|
@@ -1222,16 +1234,53 @@ function peg$parse(input, options) {
|
|
|
1222
1234
|
return s0;
|
|
1223
1235
|
}
|
|
1224
1236
|
|
|
1237
|
+
function peg$parseNONE() {
|
|
1238
|
+
var s0, s1, s2, s3;
|
|
1239
|
+
|
|
1240
|
+
s0 = peg$currPos;
|
|
1241
|
+
s1 = input.substr(peg$currPos, 4);
|
|
1242
|
+
if (s1.toLowerCase() === peg$c13) {
|
|
1243
|
+
peg$currPos += 4;
|
|
1244
|
+
} else {
|
|
1245
|
+
s1 = peg$FAILED;
|
|
1246
|
+
if (peg$silentFails === 0) { peg$fail(peg$e17); }
|
|
1247
|
+
}
|
|
1248
|
+
if (s1 !== peg$FAILED) {
|
|
1249
|
+
s2 = peg$currPos;
|
|
1250
|
+
peg$silentFails++;
|
|
1251
|
+
s3 = peg$parseidChar();
|
|
1252
|
+
peg$silentFails--;
|
|
1253
|
+
if (s3 === peg$FAILED) {
|
|
1254
|
+
s2 = undefined;
|
|
1255
|
+
} else {
|
|
1256
|
+
peg$currPos = s2;
|
|
1257
|
+
s2 = peg$FAILED;
|
|
1258
|
+
}
|
|
1259
|
+
if (s2 !== peg$FAILED) {
|
|
1260
|
+
s1 = [s1, s2];
|
|
1261
|
+
s0 = s1;
|
|
1262
|
+
} else {
|
|
1263
|
+
peg$currPos = s0;
|
|
1264
|
+
s0 = peg$FAILED;
|
|
1265
|
+
}
|
|
1266
|
+
} else {
|
|
1267
|
+
peg$currPos = s0;
|
|
1268
|
+
s0 = peg$FAILED;
|
|
1269
|
+
}
|
|
1270
|
+
|
|
1271
|
+
return s0;
|
|
1272
|
+
}
|
|
1273
|
+
|
|
1225
1274
|
function peg$parseAND() {
|
|
1226
1275
|
var s0, s1, s2, s3;
|
|
1227
1276
|
|
|
1228
1277
|
s0 = peg$currPos;
|
|
1229
1278
|
s1 = input.substr(peg$currPos, 3);
|
|
1230
|
-
if (s1.toLowerCase() === peg$
|
|
1279
|
+
if (s1.toLowerCase() === peg$c14) {
|
|
1231
1280
|
peg$currPos += 3;
|
|
1232
1281
|
} else {
|
|
1233
1282
|
s1 = peg$FAILED;
|
|
1234
|
-
if (peg$silentFails === 0) { peg$fail(peg$
|
|
1283
|
+
if (peg$silentFails === 0) { peg$fail(peg$e18); }
|
|
1235
1284
|
}
|
|
1236
1285
|
if (s1 !== peg$FAILED) {
|
|
1237
1286
|
s2 = peg$currPos;
|
|
@@ -1264,11 +1313,11 @@ function peg$parse(input, options) {
|
|
|
1264
1313
|
|
|
1265
1314
|
s0 = peg$currPos;
|
|
1266
1315
|
s1 = input.substr(peg$currPos, 2);
|
|
1267
|
-
if (s1.toLowerCase() === peg$
|
|
1316
|
+
if (s1.toLowerCase() === peg$c15) {
|
|
1268
1317
|
peg$currPos += 2;
|
|
1269
1318
|
} else {
|
|
1270
1319
|
s1 = peg$FAILED;
|
|
1271
|
-
if (peg$silentFails === 0) { peg$fail(peg$
|
|
1320
|
+
if (peg$silentFails === 0) { peg$fail(peg$e19); }
|
|
1272
1321
|
}
|
|
1273
1322
|
if (s1 !== peg$FAILED) {
|
|
1274
1323
|
s2 = peg$currPos;
|
|
@@ -1301,11 +1350,11 @@ function peg$parse(input, options) {
|
|
|
1301
1350
|
|
|
1302
1351
|
s0 = peg$currPos;
|
|
1303
1352
|
s1 = input.substr(peg$currPos, 2);
|
|
1304
|
-
if (s1.toLowerCase() === peg$
|
|
1353
|
+
if (s1.toLowerCase() === peg$c16) {
|
|
1305
1354
|
peg$currPos += 2;
|
|
1306
1355
|
} else {
|
|
1307
1356
|
s1 = peg$FAILED;
|
|
1308
|
-
if (peg$silentFails === 0) { peg$fail(peg$
|
|
1357
|
+
if (peg$silentFails === 0) { peg$fail(peg$e20); }
|
|
1309
1358
|
}
|
|
1310
1359
|
if (s1 !== peg$FAILED) {
|
|
1311
1360
|
s2 = peg$currPos;
|
|
@@ -1341,7 +1390,7 @@ function peg$parse(input, options) {
|
|
|
1341
1390
|
peg$currPos++;
|
|
1342
1391
|
} else {
|
|
1343
1392
|
s0 = peg$FAILED;
|
|
1344
|
-
if (peg$silentFails === 0) { peg$fail(peg$
|
|
1393
|
+
if (peg$silentFails === 0) { peg$fail(peg$e21); }
|
|
1345
1394
|
}
|
|
1346
1395
|
|
|
1347
1396
|
return s0;
|
|
@@ -1357,7 +1406,7 @@ function peg$parse(input, options) {
|
|
|
1357
1406
|
peg$currPos++;
|
|
1358
1407
|
} else {
|
|
1359
1408
|
s1 = peg$FAILED;
|
|
1360
|
-
if (peg$silentFails === 0) { peg$fail(peg$
|
|
1409
|
+
if (peg$silentFails === 0) { peg$fail(peg$e23); }
|
|
1361
1410
|
}
|
|
1362
1411
|
while (s1 !== peg$FAILED) {
|
|
1363
1412
|
s0.push(s1);
|
|
@@ -1366,12 +1415,12 @@ function peg$parse(input, options) {
|
|
|
1366
1415
|
peg$currPos++;
|
|
1367
1416
|
} else {
|
|
1368
1417
|
s1 = peg$FAILED;
|
|
1369
|
-
if (peg$silentFails === 0) { peg$fail(peg$
|
|
1418
|
+
if (peg$silentFails === 0) { peg$fail(peg$e23); }
|
|
1370
1419
|
}
|
|
1371
1420
|
}
|
|
1372
1421
|
peg$silentFails--;
|
|
1373
1422
|
s1 = peg$FAILED;
|
|
1374
|
-
if (peg$silentFails === 0) { peg$fail(peg$
|
|
1423
|
+
if (peg$silentFails === 0) { peg$fail(peg$e22); }
|
|
1375
1424
|
|
|
1376
1425
|
return s0;
|
|
1377
1426
|
}
|