@malloydata/malloy-filter 0.0.422 → 0.0.424

package/src/lib/ftemporal_parser.js

@@ -195,30 +195,31 @@ function peg$parse(input, options) {
   var peg$c12 = ":";
   var peg$c13 = "not";
   var peg$c14 = "null";
-  var peg$c15 = "to";
-  var peg$c16 = "now";
-  var peg$c17 = "last";
-  var peg$c18 = "this";
-  var peg$c19 = "next";
-  var peg$c20 = "ago";
-  var peg$c21 = "from";
-  var peg$c22 = "before";
-  var peg$c23 = "after";
-  var peg$c24 = "through";
-  var peg$c25 = "starting";
-  var peg$c26 = "for";
-  var peg$c27 = "today";
-  var peg$c28 = "yesterday";
-  var peg$c29 = "tomorrow";
-  var peg$c30 = "and";
-  var peg$c31 = "or";
-  var peg$c32 = "monday";
-  var peg$c33 = "tuesday";
-  var peg$c34 = "wednesday";
-  var peg$c35 = "thursday";
-  var peg$c36 = "friday";
-  var peg$c37 = "saturday";
-  var peg$c38 = "sunday";
+  var peg$c15 = "none";
+  var peg$c16 = "to";
+  var peg$c17 = "now";
+  var peg$c18 = "last";
+  var peg$c19 = "this";
+  var peg$c20 = "next";
+  var peg$c21 = "ago";
+  var peg$c22 = "from";
+  var peg$c23 = "before";
+  var peg$c24 = "after";
+  var peg$c25 = "through";
+  var peg$c26 = "starting";
+  var peg$c27 = "for";
+  var peg$c28 = "today";
+  var peg$c29 = "yesterday";
+  var peg$c30 = "tomorrow";
+  var peg$c31 = "and";
+  var peg$c32 = "or";
+  var peg$c33 = "monday";
+  var peg$c34 = "tuesday";
+  var peg$c35 = "wednesday";
+  var peg$c36 = "thursday";
+  var peg$c37 = "friday";
+  var peg$c38 = "saturday";
+  var peg$c39 = "sunday";
 
   var peg$r0 = /^[0-9]/;
   var peg$r1 = /^[ Tt]/;
@@ -252,34 +253,35 @@ function peg$parse(input, options) {
   var peg$e19 = peg$classExpectation(["1", "2", "3", "4"], false, false);
   var peg$e20 = peg$literalExpectation("not", true);
   var peg$e21 = peg$literalExpectation("null", true);
-  var peg$e22 = peg$literalExpectation("to", true);
-  var peg$e23 = peg$literalExpectation("now", true);
-  var peg$e24 = peg$literalExpectation("last", true);
-  var peg$e25 = peg$literalExpectation("this", true);
-  var peg$e26 = peg$literalExpectation("next", true);
-  var peg$e27 = peg$literalExpectation("ago", true);
-  var peg$e28 = peg$literalExpectation("from", true);
-  var peg$e29 = peg$literalExpectation("before", true);
-  var peg$e30 = peg$literalExpectation("after", true);
-  var peg$e31 = peg$literalExpectation("through", true);
-  var peg$e32 = peg$literalExpectation("starting", true);
-  var peg$e33 = peg$literalExpectation("for", true);
-  var peg$e34 = peg$literalExpectation("today", true);
-  var peg$e35 = peg$literalExpectation("yesterday", true);
-  var peg$e36 = peg$literalExpectation("tomorrow", true);
-  var peg$e37 = peg$literalExpectation("and", true);
-  var peg$e38 = peg$literalExpectation("or", true);
-  var peg$e39 = peg$literalExpectation("monday", true);
-  var peg$e40 = peg$literalExpectation("tuesday", true);
-  var peg$e41 = peg$literalExpectation("wednesday", true);
-  var peg$e42 = peg$literalExpectation("thursday", true);
-  var peg$e43 = peg$literalExpectation("friday", true);
-  var peg$e44 = peg$literalExpectation("saturday", true);
-  var peg$e45 = peg$literalExpectation("sunday", true);
-  var peg$e46 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false);
-  var peg$e47 = peg$otherExpectation("optional whitespace");
-  var peg$e48 = peg$classExpectation([" ", "\t"], false, false);
-  var peg$e49 = peg$otherExpectation("whitespace");
+  var peg$e22 = peg$literalExpectation("none", true);
+  var peg$e23 = peg$literalExpectation("to", true);
+  var peg$e24 = peg$literalExpectation("now", true);
+  var peg$e25 = peg$literalExpectation("last", true);
+  var peg$e26 = peg$literalExpectation("this", true);
+  var peg$e27 = peg$literalExpectation("next", true);
+  var peg$e28 = peg$literalExpectation("ago", true);
+  var peg$e29 = peg$literalExpectation("from", true);
+  var peg$e30 = peg$literalExpectation("before", true);
+  var peg$e31 = peg$literalExpectation("after", true);
+  var peg$e32 = peg$literalExpectation("through", true);
+  var peg$e33 = peg$literalExpectation("starting", true);
+  var peg$e34 = peg$literalExpectation("for", true);
+  var peg$e35 = peg$literalExpectation("today", true);
+  var peg$e36 = peg$literalExpectation("yesterday", true);
+  var peg$e37 = peg$literalExpectation("tomorrow", true);
+  var peg$e38 = peg$literalExpectation("and", true);
+  var peg$e39 = peg$literalExpectation("or", true);
+  var peg$e40 = peg$literalExpectation("monday", true);
+  var peg$e41 = peg$literalExpectation("tuesday", true);
+  var peg$e42 = peg$literalExpectation("wednesday", true);
+  var peg$e43 = peg$literalExpectation("thursday", true);
+  var peg$e44 = peg$literalExpectation("friday", true);
+  var peg$e45 = peg$literalExpectation("saturday", true);
+  var peg$e46 = peg$literalExpectation("sunday", true);
+  var peg$e47 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false);
+  var peg$e48 = peg$otherExpectation("optional whitespace");
+  var peg$e49 = peg$classExpectation([" ", "\t"], false, false);
+  var peg$e50 = peg$otherExpectation("whitespace");
 
   var peg$f0 = function(head, tail) {
       return tail.reduce((left, [, cop, , right]) => joinTemporal(left, cop, right), head);
@@ -287,46 +289,47 @@ function peg$parse(input, options) {
   var peg$f1 = function(clause) { return temporalNot(clause, true); };
   var peg$f2 = function(clause) { return clause; };
   var peg$f3 = function() { return {operator: 'null'}; };
-  var peg$f4 = function(expr) { return {operator: "()", expr}; };
-  var peg$f5 = function(m) { return {operator: 'before', before: m}; };
-  var peg$f6 = function(m) { return {operator: 'before', before: m, not: true}; };
-  var peg$f7 = function(m) { return {operator: 'after', after: m}; };
-  var peg$f8 = function(m) { return {operator: 'after', after: m, not: true}; };
-  var peg$f9 = function(ln, d) { return {operator: ln, ...d}; };
-  var peg$f10 = function(m, m2) { return {operator: 'to', fromMoment: m, toMoment: m2}; };
-  var peg$f11 = function(m, d) { return {...d, operator: 'for', begin: m}; };
-  var peg$f12 = function(m) { return {operator: 'in', in: m}; };
-  var peg$f13 = function(d) { return {operator: 'in_last', ...d}; };
-  var peg$f14 = function() { return 'last'; };
-  var peg$f15 = function() { return 'next'; };
-  var peg$f16 = function(n, u) { return {units: u, n}; };
-  var peg$f17 = function(n) { return n; };
-  var peg$f18 = function(u) { return mkUnits(u); };
-  var peg$f19 = function() { return {moment: 'now'}; };
-  var peg$f20 = function() { return {moment: 'today'}; };
-  var peg$f21 = function() { return {moment: 'yesterday'}; };
-  var peg$f22 = function() { return {moment: 'tomorrow'}; };
-  var peg$f23 = function(d) { return {moment: 'ago', ...d}; };
-  var peg$f24 = function(d) { return {moment: 'from_now', ...d}; };
-  var peg$f25 = function(dn) { return {moment: dn.toLowerCase(), which: 'next'}; };
-  var peg$f26 = function(dn) { return {moment: dn.toLowerCase(), which: 'last'}; };
-  var peg$f27 = function(lnt, u) { return {moment: lnt, units: u}; };
-  var peg$f28 = function(dn) { return {moment: dn.toLowerCase(), which: 'last'}; };
-  var peg$f29 = function(tl) { return tl; };
-  var peg$f30 = function() { return 'this'; };
-  var peg$f31 = function() { return 'next'; };
-  var peg$f32 = function() { return 'last'; };
-  var peg$f33 = function(l) { return timeLiteral(l); };
-  var peg$f34 = function(l) { return timeLiteral(l, 'week'); };
-  var peg$f35 = function(l) { return timeLiteral(l, 'quarter'); };
-  var peg$f36 = function(l) { return timeLiteral(l, 'minute'); };
-  var peg$f37 = function(l) { return timeLiteral(l, 'hour'); };
-  var peg$f38 = function(l) { return timeLiteral(l, 'day'); };
-  var peg$f39 = function(l) { return timeLiteral(l, 'month'); };
-  var peg$f40 = function(l) { return timeLiteral(l, 'year'); };
-  var peg$f41 = function(w) { return w; };
-  var peg$f42 = function() { return "or"; };
-  var peg$f43 = function() { return "and"; };
+  var peg$f4 = function() { return {operator: 'none'}; };
+  var peg$f5 = function(expr) { return {operator: "()", expr}; };
+  var peg$f6 = function(m) { return {operator: 'before', before: m}; };
+  var peg$f7 = function(m) { return {operator: 'before', before: m, not: true}; };
+  var peg$f8 = function(m) { return {operator: 'after', after: m}; };
+  var peg$f9 = function(m) { return {operator: 'after', after: m, not: true}; };
+  var peg$f10 = function(ln, d) { return {operator: ln, ...d}; };
+  var peg$f11 = function(m, m2) { return {operator: 'to', fromMoment: m, toMoment: m2}; };
+  var peg$f12 = function(m, d) { return {...d, operator: 'for', begin: m}; };
+  var peg$f13 = function(m) { return {operator: 'in', in: m}; };
+  var peg$f14 = function(d) { return {operator: 'in_last', ...d}; };
+  var peg$f15 = function() { return 'last'; };
+  var peg$f16 = function() { return 'next'; };
+  var peg$f17 = function(n, u) { return {units: u, n}; };
+  var peg$f18 = function(n) { return n; };
+  var peg$f19 = function(u) { return mkUnits(u); };
+  var peg$f20 = function() { return {moment: 'now'}; };
+  var peg$f21 = function() { return {moment: 'today'}; };
+  var peg$f22 = function() { return {moment: 'yesterday'}; };
+  var peg$f23 = function() { return {moment: 'tomorrow'}; };
+  var peg$f24 = function(d) { return {moment: 'ago', ...d}; };
+  var peg$f25 = function(d) { return {moment: 'from_now', ...d}; };
+  var peg$f26 = function(dn) { return {moment: dn.toLowerCase(), which: 'next'}; };
+  var peg$f27 = function(dn) { return {moment: dn.toLowerCase(), which: 'last'}; };
+  var peg$f28 = function(lnt, u) { return {moment: lnt, units: u}; };
+  var peg$f29 = function(dn) { return {moment: dn.toLowerCase(), which: 'last'}; };
+  var peg$f30 = function(tl) { return tl; };
+  var peg$f31 = function() { return 'this'; };
+  var peg$f32 = function() { return 'next'; };
+  var peg$f33 = function() { return 'last'; };
+  var peg$f34 = function(l) { return timeLiteral(l); };
+  var peg$f35 = function(l) { return timeLiteral(l, 'week'); };
+  var peg$f36 = function(l) { return timeLiteral(l, 'quarter'); };
+  var peg$f37 = function(l) { return timeLiteral(l, 'minute'); };
+  var peg$f38 = function(l) { return timeLiteral(l, 'hour'); };
+  var peg$f39 = function(l) { return timeLiteral(l, 'day'); };
+  var peg$f40 = function(l) { return timeLiteral(l, 'month'); };
+  var peg$f41 = function(l) { return timeLiteral(l, 'year'); };
+  var peg$f42 = function(w) { return w; };
+  var peg$f43 = function() { return "or"; };
+  var peg$f44 = function() { return "and"; };
   var peg$currPos = options.peg$currPos | 0;
   var peg$savedPos = peg$currPos;
   var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -592,48 +595,34 @@ function peg$parse(input, options) {
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.charCodeAt(peg$currPos) === 40) {
-        s1 = peg$c0;
-        peg$currPos++;
-      } else {
-        s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e0); }
-      }
+      s1 = peg$parseNONE();
       if (s1 !== peg$FAILED) {
-        s2 = peg$parse_();
-        s3 = peg$parsetemporalFilter();
-        if (s3 !== peg$FAILED) {
-          s4 = peg$parse_();
-          if (input.charCodeAt(peg$currPos) === 41) {
-            s5 = peg$c1;
-            peg$currPos++;
-          } else {
-            s5 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e1); }
-          }
-          if (s5 !== peg$FAILED) {
-            peg$savedPos = s0;
-            s0 = peg$f4(s3);
-          } else {
-            peg$currPos = s0;
-            s0 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s0;
-          s0 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
+        peg$savedPos = s0;
+        s1 = peg$f4();
       }
+      s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        s1 = peg$parseBEFORE();
+        if (input.charCodeAt(peg$currPos) === 40) {
+          s1 = peg$c0;
+          peg$currPos++;
+        } else {
+          s1 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e0); }
+        }
         if (s1 !== peg$FAILED) {
-          s2 = peg$parse__();
-          if (s2 !== peg$FAILED) {
-            s3 = peg$parsemoment();
-            if (s3 !== peg$FAILED) {
+          s2 = peg$parse_();
+          s3 = peg$parsetemporalFilter();
+          if (s3 !== peg$FAILED) {
+            s4 = peg$parse_();
+            if (input.charCodeAt(peg$currPos) === 41) {
+              s5 = peg$c1;
+              peg$currPos++;
+            } else {
+              s5 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$e1); }
+            }
+            if (s5 !== peg$FAILED) {
               peg$savedPos = s0;
               s0 = peg$f5(s3);
             } else {
@@ -650,7 +639,7 @@ function peg$parse(input, options) {
         }
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
-          s1 = peg$parseSTARTING();
+          s1 = peg$parseBEFORE();
           if (s1 !== peg$FAILED) {
             s2 = peg$parse__();
             if (s2 !== peg$FAILED) {
@@ -672,7 +661,7 @@ function peg$parse(input, options) {
           }
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            s1 = peg$parseAFTER();
+            s1 = peg$parseSTARTING();
             if (s1 !== peg$FAILED) {
               s2 = peg$parse__();
               if (s2 !== peg$FAILED) {
@@ -694,7 +683,7 @@ function peg$parse(input, options) {
             }
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
-              s1 = peg$parseTHROUGH();
+              s1 = peg$parseAFTER();
               if (s1 !== peg$FAILED) {
                 s2 = peg$parse__();
                 if (s2 !== peg$FAILED) {
@@ -716,14 +705,14 @@ function peg$parse(input, options) {
               }
               if (s0 === peg$FAILED) {
                 s0 = peg$currPos;
-                s1 = peg$parselastOrNext();
+                s1 = peg$parseTHROUGH();
                 if (s1 !== peg$FAILED) {
                   s2 = peg$parse__();
                   if (s2 !== peg$FAILED) {
-                    s3 = peg$parseduration();
+                    s3 = peg$parsemoment();
                     if (s3 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s0 = peg$f9(s1, s3);
+                      s0 = peg$f9(s3);
                     } else {
                       peg$currPos = s0;
                       s0 = peg$FAILED;
@@ -738,26 +727,14 @@ function peg$parse(input, options) {
                 }
                 if (s0 === peg$FAILED) {
                   s0 = peg$currPos;
-                  s1 = peg$parsemoment();
+                  s1 = peg$parselastOrNext();
                   if (s1 !== peg$FAILED) {
                     s2 = peg$parse__();
                     if (s2 !== peg$FAILED) {
-                      s3 = peg$parseTO();
+                      s3 = peg$parseduration();
                       if (s3 !== peg$FAILED) {
-                        s4 = peg$parse__();
-                        if (s4 !== peg$FAILED) {
-                          s5 = peg$parsemoment();
-                          if (s5 !== peg$FAILED) {
-                            peg$savedPos = s0;
-                            s0 = peg$f10(s1, s5);
-                          } else {
-                            peg$currPos = s0;
-                            s0 = peg$FAILED;
-                          }
-                        } else {
-                          peg$currPos = s0;
-                          s0 = peg$FAILED;
-                        }
+                        peg$savedPos = s0;
+                        s0 = peg$f10(s1, s3);
                       } else {
                         peg$currPos = s0;
                         s0 = peg$FAILED;
@@ -776,11 +753,11 @@ function peg$parse(input, options) {
                     if (s1 !== peg$FAILED) {
                       s2 = peg$parse__();
                       if (s2 !== peg$FAILED) {
-                        s3 = peg$parseFOR();
+                        s3 = peg$parseTO();
                         if (s3 !== peg$FAILED) {
                           s4 = peg$parse__();
                           if (s4 !== peg$FAILED) {
-                            s5 = peg$parseduration();
+                            s5 = peg$parsemoment();
                             if (s5 !== peg$FAILED) {
                               peg$savedPos = s0;
                               s0 = peg$f11(s1, s5);
@@ -808,18 +785,53 @@ function peg$parse(input, options) {
                       s0 = peg$currPos;
                       s1 = peg$parsemoment();
                       if (s1 !== peg$FAILED) {
-                        peg$savedPos = s0;
-                        s1 = peg$f12(s1);
+                        s2 = peg$parse__();
+                        if (s2 !== peg$FAILED) {
+                          s3 = peg$parseFOR();
+                          if (s3 !== peg$FAILED) {
+                            s4 = peg$parse__();
+                            if (s4 !== peg$FAILED) {
+                              s5 = peg$parseduration();
+                              if (s5 !== peg$FAILED) {
+                                peg$savedPos = s0;
+                                s0 = peg$f12(s1, s5);
+                              } else {
+                                peg$currPos = s0;
+                                s0 = peg$FAILED;
+                              }
+                            } else {
+                              peg$currPos = s0;
+                              s0 = peg$FAILED;
+                            }
+                          } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                          }
+                        } else {
+                          peg$currPos = s0;
+                          s0 = peg$FAILED;
+                        }
+                      } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
                       }
-                      s0 = s1;
                       if (s0 === peg$FAILED) {
                         s0 = peg$currPos;
-                        s1 = peg$parseduration();
+                        s1 = peg$parsemoment();
                         if (s1 !== peg$FAILED) {
                           peg$savedPos = s0;
                           s1 = peg$f13(s1);
                         }
                         s0 = s1;
+                        if (s0 === peg$FAILED) {
+                          s0 = peg$currPos;
+                          s1 = peg$parseduration();
+                          if (s1 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$f14(s1);
+                          }
+                          s0 = s1;
+                        }
                       }
                     }
                   }
@@ -841,7 +853,7 @@ function peg$parse(input, options) {
     s1 = peg$parseLAST();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f14();
+      s1 = peg$f15();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -849,7 +861,7 @@ function peg$parse(input, options) {
       s1 = peg$parseNEXT();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f15();
+        s1 = peg$f16();
       }
       s0 = s1;
     }
@@ -868,7 +880,7 @@ function peg$parse(input, options) {
         s3 = peg$parseunit();
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f16(s1, s3);
+          s0 = peg$f17(s1, s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -919,7 +931,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f17(s1);
+      s1 = peg$f18(s1);
     }
     s0 = s1;
 
@@ -1029,7 +1041,7 @@ function peg$parse(input, options) {
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f18(s1);
+        s0 = peg$f19(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1049,7 +1061,7 @@ function peg$parse(input, options) {
     s1 = peg$parseNOW();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f19();
+      s1 = peg$f20();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -1057,7 +1069,7 @@ function peg$parse(input, options) {
       s1 = peg$parseTODAY();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f20();
+        s1 = peg$f21();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
@@ -1065,7 +1077,7 @@ function peg$parse(input, options) {
         s1 = peg$parseYESTERDAY();
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f21();
+          s1 = peg$f22();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
@@ -1073,7 +1085,7 @@ function peg$parse(input, options) {
           s1 = peg$parseTOMORROW();
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f22();
+            s1 = peg$f23();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
@@ -1085,7 +1097,7 @@ function peg$parse(input, options) {
                 s3 = peg$parseAGO();
                 if (s3 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s0 = peg$f23(s1);
+                  s0 = peg$f24(s1);
                 } else {
                   peg$currPos = s0;
                   s0 = peg$FAILED;
@@ -1111,7 +1123,7 @@ function peg$parse(input, options) {
                       s5 = peg$parseNOW();
                       if (s5 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s0 = peg$f24(s1);
+                        s0 = peg$f25(s1);
                       } else {
                         peg$currPos = s0;
                         s0 = peg$FAILED;
@@ -1141,7 +1153,7 @@ function peg$parse(input, options) {
                     s3 = peg$parseweekday();
                     if (s3 !== peg$FAILED) {
                       peg$savedPos = s0;
-                      s0 = peg$f25(s3);
+                      s0 = peg$f26(s3);
                     } else {
                       peg$currPos = s0;
                       s0 = peg$FAILED;
@@ -1163,7 +1175,7 @@ function peg$parse(input, options) {
                       s3 = peg$parseweekday();
                       if (s3 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s0 = peg$f26(s3);
+                        s0 = peg$f27(s3);
                       } else {
                         peg$currPos = s0;
                         s0 = peg$FAILED;
@@ -1185,7 +1197,7 @@ function peg$parse(input, options) {
                         s3 = peg$parseunit();
                         if (s3 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s0 = peg$f27(s1, s3);
+                          s0 = peg$f28(s1, s3);
                         } else {
                           peg$currPos = s0;
                           s0 = peg$FAILED;
@@ -1203,7 +1215,7 @@ function peg$parse(input, options) {
                       s1 = peg$parseweekday();
                       if (s1 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s1 = peg$f28(s1);
+                        s1 = peg$f29(s1);
                       }
                       s0 = s1;
                       if (s0 === peg$FAILED) {
@@ -1211,7 +1223,7 @@ function peg$parse(input, options) {
                         s1 = peg$parsetimeLiteral();
                         if (s1 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s1 = peg$f29(s1);
+                          s1 = peg$f30(s1);
                         }
                         s0 = s1;
                       }
@@ -1235,7 +1247,7 @@ function peg$parse(input, options) {
     s1 = peg$parseTHIS();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f30();
+      s1 = peg$f31();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -1243,7 +1255,7 @@ function peg$parse(input, options) {
       s1 = peg$parseNEXT();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f31();
+        s1 = peg$f32();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
@@ -1251,7 +1263,7 @@ function peg$parse(input, options) {
         s1 = peg$parseLAST();
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f32();
+          s1 = peg$f33();
         }
         s0 = s1;
       }
@@ -1539,7 +1551,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f33(s1);
+      s1 = peg$f34(s1);
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -1711,7 +1723,7 @@ function peg$parse(input, options) {
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f34(s1);
+        s1 = peg$f35(s1);
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
@@ -1811,7 +1823,7 @@ function peg$parse(input, options) {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f35(s1);
+          s1 = peg$f36(s1);
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
@@ -2019,7 +2031,7 @@ function peg$parse(input, options) {
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f36(s1);
+            s1 = peg$f37(s1);
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
@@ -2191,7 +2203,7 @@ function peg$parse(input, options) {
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f37(s1);
+              s1 = peg$f38(s1);
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
@@ -2327,7 +2339,7 @@ function peg$parse(input, options) {
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f38(s1);
+                s1 = peg$f39(s1);
               }
               s0 = s1;
               if (s0 === peg$FAILED) {
@@ -2427,7 +2439,7 @@ function peg$parse(input, options) {
                 }
                 if (s1 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s1 = peg$f39(s1);
+                  s1 = peg$f40(s1);
                 }
                 s0 = s1;
                 if (s0 === peg$FAILED) {
@@ -2491,7 +2503,7 @@ function peg$parse(input, options) {
                   }
                   if (s1 !== peg$FAILED) {
                     peg$savedPos = s0;
-                    s1 = peg$f40(s1);
+                    s1 = peg$f41(s1);
                   }
                   s0 = s1;
                 }
@@ -2536,7 +2548,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f41(s1);
+      s1 = peg$f42(s1);
     }
     s0 = s1;
 
@@ -2550,7 +2562,7 @@ function peg$parse(input, options) {
     s1 = peg$parseOR();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f42();
+      s1 = peg$f43();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -2558,7 +2570,7 @@ function peg$parse(input, options) {
       s1 = peg$parseAND();
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f43();
+        s1 = peg$f44();
       }
       s0 = s1;
     }
@@ -2640,16 +2652,53 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parseNONE() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 4);
+    if (s1.toLowerCase() === peg$c15) {
+      peg$currPos += 4;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      peg$silentFails++;
+      s3 = peg$parseidChar();
+      peg$silentFails--;
+      if (s3 === peg$FAILED) {
+        s2 = undefined;
+      } else {
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        s1 = [s1, s2];
+        s0 = s1;
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
   function peg$parseTO() {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c15) {
+    if (s1.toLowerCase() === peg$c16) {
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+      if (peg$silentFails === 0) { peg$fail(peg$e23); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2682,11 +2731,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c16) {
+    if (s1.toLowerCase() === peg$c17) {
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e23); }
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2719,11 +2768,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c17) {
+    if (s1.toLowerCase() === peg$c18) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e24); }
+      if (peg$silentFails === 0) { peg$fail(peg$e25); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2756,11 +2805,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c18) {
+    if (s1.toLowerCase() === peg$c19) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2793,11 +2842,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c19) {
+    if (s1.toLowerCase() === peg$c20) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e26); }
+      if (peg$silentFails === 0) { peg$fail(peg$e27); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2830,11 +2879,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c20) {
+    if (s1.toLowerCase() === peg$c21) {
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e27); }
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2867,11 +2916,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 4);
-    if (s1.toLowerCase() === peg$c21) {
+    if (s1.toLowerCase() === peg$c22) {
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+      if (peg$silentFails === 0) { peg$fail(peg$e29); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2904,11 +2953,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c22) {
+    if (s1.toLowerCase() === peg$c23) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2941,11 +2990,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c23) {
+    if (s1.toLowerCase() === peg$c24) {
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e30); }
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2978,11 +3027,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c24) {
+    if (s1.toLowerCase() === peg$c25) {
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3015,11 +3064,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c25) {
+    if (s1.toLowerCase() === peg$c26) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3052,11 +3101,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c26) {
+    if (s1.toLowerCase() === peg$c27) {
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e33); }
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3089,11 +3138,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 5);
-    if (s1.toLowerCase() === peg$c27) {
+    if (s1.toLowerCase() === peg$c28) {
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3126,11 +3175,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c28) {
+    if (s1.toLowerCase() === peg$c29) {
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3163,11 +3212,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c29) {
+    if (s1.toLowerCase() === peg$c30) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e36); }
+      if (peg$silentFails === 0) { peg$fail(peg$e37); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3200,11 +3249,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 3);
-    if (s1.toLowerCase() === peg$c30) {
+    if (s1.toLowerCase() === peg$c31) {
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e37); }
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3237,11 +3286,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 2);
-    if (s1.toLowerCase() === peg$c31) {
+    if (s1.toLowerCase() === peg$c32) {
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      if (peg$silentFails === 0) { peg$fail(peg$e39); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3274,11 +3323,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c32) {
+    if (s1.toLowerCase() === peg$c33) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e39); }
+      if (peg$silentFails === 0) { peg$fail(peg$e40); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3311,11 +3360,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 7);
-    if (s1.toLowerCase() === peg$c33) {
+    if (s1.toLowerCase() === peg$c34) {
       peg$currPos += 7;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e40); }
+      if (peg$silentFails === 0) { peg$fail(peg$e41); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3348,11 +3397,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 9);
-    if (s1.toLowerCase() === peg$c34) {
+    if (s1.toLowerCase() === peg$c35) {
       peg$currPos += 9;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e41); }
+      if (peg$silentFails === 0) { peg$fail(peg$e42); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3385,11 +3434,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c35) {
+    if (s1.toLowerCase() === peg$c36) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e42); }
+      if (peg$silentFails === 0) { peg$fail(peg$e43); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3422,11 +3471,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c36) {
+    if (s1.toLowerCase() === peg$c37) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e43); }
+      if (peg$silentFails === 0) { peg$fail(peg$e44); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3459,11 +3508,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 8);
-    if (s1.toLowerCase() === peg$c37) {
+    if (s1.toLowerCase() === peg$c38) {
       peg$currPos += 8;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e44); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3496,11 +3545,11 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = input.substr(peg$currPos, 6);
-    if (s1.toLowerCase() === peg$c38) {
+    if (s1.toLowerCase() === peg$c39) {
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e45); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3536,7 +3585,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e46); }
+      if (peg$silentFails === 0) { peg$fail(peg$e47); }
     }
 
     return s0;
@@ -3552,7 +3601,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e49); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -3561,12 +3610,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e48); }
+        if (peg$silentFails === 0) { peg$fail(peg$e49); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e47); }
+    if (peg$silentFails === 0) { peg$fail(peg$e48); }
 
     return s0;
   }
@@ -3581,7 +3630,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e49); }
     }
     if (s1 !== peg$FAILED) {
       while (s1 !== peg$FAILED) {
@@ -3591,7 +3640,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e48); }
+          if (peg$silentFails === 0) { peg$fail(peg$e49); }
         }
       }
     } else {
@@ -3600,7 +3649,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e49); }
+      if (peg$silentFails === 0) { peg$fail(peg$e50); }
     }
 
     return s0;