@dbml/core 2.4.1 → 2.4.2

package/lib/parse/dbmlParser.js

@@ -291,17 +291,18 @@ function peg$parse(input, options) {
     return ref;
   },
       peg$c25 = function peg$c25(field1, relation, field2, ref_settings) {
+    var rel = getRelations(relation);
     var endpoints = [{
       schemaName: field1.schemaName,
       tableName: field1.tableName,
       fieldNames: field1.fieldNames,
-      relation: relation === ">" ? "*" : "1",
+      relation: rel[0],
       token: location()
     }, {
       schemaName: field2.schemaName,
       tableName: field2.tableName,
       fieldNames: field2.fieldNames,
-      relation: relation === "<" ? "*" : "1",
+      relation: rel[1],
       token: location()
     }];
     return {
@@ -372,17 +373,18 @@ function peg$parse(input, options) {
     var refs = [];
     fields.forEach(function (field) {
       (field.inline_refs || []).forEach(function (iref) {
+        var rel = getRelations(iref.relation);
         var endpoints = [{
           schemaName: iref.schemaName,
           tableName: iref.tableName,
           fieldNames: iref.fieldNames,
-          relation: iref.relation === "<" ? "*" : "1",
+          relation: rel[1],
           token: iref.token
         }, {
           schemaName: schemaName,
           tableName: name,
           fieldNames: [field.name],
-          relation: iref.relation === ">" ? "*" : "1",
+          relation: rel[0],
           token: iref.token
         }];
         var ref = {
@@ -791,51 +793,57 @@ function peg$parse(input, options) {
       peg$c151 = peg$otherExpectation("set default"),
       peg$c152 = "set default",
       peg$c153 = peg$literalExpectation("set default", true),
-      peg$c154 = peg$otherExpectation(">, - or <"),
-      peg$c155 = /^[>\-<]/,
-      peg$c156 = peg$classExpectation([">", "-", "<"], false, false),
-      peg$c157 = peg$otherExpectation("valid name"),
-      peg$c158 = function peg$c158(c) {
+      peg$c154 = peg$otherExpectation("<>, >, - or <"),
+      peg$c155 = "<>",
+      peg$c156 = peg$literalExpectation("<>", false),
+      peg$c157 = ">",
+      peg$c158 = peg$literalExpectation(">", false),
+      peg$c159 = "<",
+      peg$c160 = peg$literalExpectation("<", false),
+      peg$c161 = "-",
+      peg$c162 = peg$literalExpectation("-", false),
+      peg$c163 = peg$otherExpectation("valid name"),
+      peg$c164 = function peg$c164(c) {
     return c.join("");
   },
-      peg$c159 = /^[^"\n]/,
-      peg$c160 = peg$classExpectation(["\"", "\n"], true, false),
-      peg$c161 = peg$otherExpectation("schema name"),
-      peg$c162 = ".",
-      peg$c163 = peg$literalExpectation(".", false),
-      peg$c164 = function peg$c164(name) {
+      peg$c165 = /^[^"\n]/,
+      peg$c166 = peg$classExpectation(["\"", "\n"], true, false),
+      peg$c167 = peg$otherExpectation("schema name"),
+      peg$c168 = ".",
+      peg$c169 = peg$literalExpectation(".", false),
+      peg$c170 = function peg$c170(name) {
     return name;
   },
-      peg$c165 = function peg$c165(schemaName, tableName, fieldNames) {
+      peg$c171 = function peg$c171(schemaName, tableName, fieldNames) {
     return {
       schemaName: schemaName,
       tableName: tableName,
       fieldNames: fieldNames
     };
   },
-      peg$c166 = function peg$c166(tableName, fieldNames) {
+      peg$c172 = function peg$c172(tableName, fieldNames) {
     return {
       schemaName: null,
       tableName: tableName,
       fieldNames: fieldNames
     };
   },
-      peg$c167 = function peg$c167(schemaName, tableName, fieldName) {
+      peg$c173 = function peg$c173(schemaName, tableName, fieldName) {
     return {
       schemaName: schemaName,
       tableName: tableName,
       fieldName: fieldName
     };
   },
-      peg$c168 = function peg$c168(tableName, fieldName) {
+      peg$c174 = function peg$c174(tableName, fieldName) {
     return {
       schemaName: null,
       tableName: tableName,
       fieldName: fieldName
     };
   },
-      peg$c169 = peg$otherExpectation("type"),
-      peg$c170 = function peg$c170(type_name, args) {
+      peg$c175 = peg$otherExpectation("type"),
+      peg$c176 = function peg$c176(type_name, args) {
     args = args ? args[3] : null;
 
     if (type_name.toLowerCase() !== 'enum') {
@@ -847,76 +855,76 @@ function peg$parse(input, options) {
       args: args
     };
   },
-      peg$c171 = peg$otherExpectation("expression"),
-      peg$c172 = function peg$c172(factors) {
+      peg$c177 = peg$otherExpectation("expression"),
+      peg$c178 = function peg$c178(factors) {
     return _.flattenDeep(factors).join("");
   },
-      peg$c173 = ",",
-      peg$c174 = peg$literalExpectation(",", false),
-      peg$c175 = ");",
-      peg$c176 = peg$literalExpectation(");", false),
-      peg$c177 = peg$anyExpectation(),
-      peg$c178 = function peg$c178(factors) {
+      peg$c179 = ",",
+      peg$c180 = peg$literalExpectation(",", false),
+      peg$c181 = ");",
+      peg$c182 = peg$literalExpectation(");", false),
+      peg$c183 = peg$anyExpectation(),
+      peg$c184 = function peg$c184(factors) {
     return _.flattenDeep(factors).join("");
   },
-      peg$c179 = /^[',.a-z0-9_+-`]/i,
-      peg$c180 = peg$classExpectation(["'", ",", ".", ["a", "z"], ["0", "9"], "_", ["+", "`"]], false, true),
-      peg$c181 = /^['.a-z0-9_+\-]/i,
-      peg$c182 = peg$classExpectation(["'", ".", ["a", "z"], ["0", "9"], "_", "+", "-"], false, true),
-      peg$c183 = function peg$c183() {
+      peg$c185 = /^[',.a-z0-9_+-`]/i,
+      peg$c186 = peg$classExpectation(["'", ",", ".", ["a", "z"], ["0", "9"], "_", ["+", "`"]], false, true),
+      peg$c187 = /^['.a-z0-9_+\-]/i,
+      peg$c188 = peg$classExpectation(["'", ".", ["a", "z"], ["0", "9"], "_", "+", "-"], false, true),
+      peg$c189 = function peg$c189() {
     return text();
   },
-      peg$c184 = /^[[\]]/,
-      peg$c185 = peg$classExpectation(["[", "]"], false, false),
-      peg$c186 = peg$otherExpectation("letter, number or underscore"),
-      peg$c187 = /^[a-z0-9_]/i,
-      peg$c188 = peg$classExpectation([["a", "z"], ["0", "9"], "_"], false, true),
-      peg$c189 = /^[0-9a-fA-F]/,
-      peg$c190 = peg$classExpectation([["0", "9"], ["a", "f"], ["A", "F"]], false, false),
-      peg$c191 = function peg$c191(c) {
+      peg$c190 = /^[[\]]/,
+      peg$c191 = peg$classExpectation(["[", "]"], false, false),
+      peg$c192 = peg$otherExpectation("letter, number or underscore"),
+      peg$c193 = /^[a-z0-9_]/i,
+      peg$c194 = peg$classExpectation([["a", "z"], ["0", "9"], "_"], false, true),
+      peg$c195 = /^[0-9a-fA-F]/,
+      peg$c196 = peg$classExpectation([["0", "9"], ["a", "f"], ["A", "F"]], false, false),
+      peg$c197 = function peg$c197(c) {
     return c.toLowerCase();
   },
-      peg$c192 = "\"",
-      peg$c193 = peg$literalExpectation("\"", false),
-      peg$c194 = peg$otherExpectation("endline"),
-      peg$c195 = "\t",
-      peg$c196 = peg$literalExpectation("\t", false),
-      peg$c197 = "//",
-      peg$c198 = peg$literalExpectation("//", false),
-      peg$c199 = /^[^\n]/,
-      peg$c200 = peg$classExpectation(["\n"], true, false),
-      peg$c201 = "/*",
-      peg$c202 = peg$literalExpectation("/*", false),
-      peg$c203 = "*/",
-      peg$c204 = peg$literalExpectation("*/", false),
-      peg$c205 = peg$otherExpectation("comment"),
-      peg$c206 = peg$otherExpectation("newline"),
-      peg$c207 = "\r\n",
-      peg$c208 = peg$literalExpectation("\r\n", false),
-      peg$c209 = "\n",
-      peg$c210 = peg$literalExpectation("\n", false),
-      peg$c211 = peg$otherExpectation("whitespace"),
-      peg$c212 = /^[ \t\r\n\r]/,
-      peg$c213 = peg$classExpectation([" ", "\t", "\r", "\n", "\r"], false, false),
-      peg$c214 = /^[ \t\r\n\r"]/,
-      peg$c215 = peg$classExpectation([" ", "\t", "\r", "\n", "\r", "\""], false, false),
-      peg$c216 = " ",
-      peg$c217 = peg$literalExpectation(" ", false),
-      peg$c218 = "#",
-      peg$c219 = peg$literalExpectation("#", false),
-      peg$c220 = function peg$c220() {
+      peg$c198 = "\"",
+      peg$c199 = peg$literalExpectation("\"", false),
+      peg$c200 = peg$otherExpectation("endline"),
+      peg$c201 = "\t",
+      peg$c202 = peg$literalExpectation("\t", false),
+      peg$c203 = "//",
+      peg$c204 = peg$literalExpectation("//", false),
+      peg$c205 = /^[^\n]/,
+      peg$c206 = peg$classExpectation(["\n"], true, false),
+      peg$c207 = "/*",
+      peg$c208 = peg$literalExpectation("/*", false),
+      peg$c209 = "*/",
+      peg$c210 = peg$literalExpectation("*/", false),
+      peg$c211 = peg$otherExpectation("comment"),
+      peg$c212 = peg$otherExpectation("newline"),
+      peg$c213 = "\r\n",
+      peg$c214 = peg$literalExpectation("\r\n", false),
+      peg$c215 = "\n",
+      peg$c216 = peg$literalExpectation("\n", false),
+      peg$c217 = peg$otherExpectation("whitespace"),
+      peg$c218 = /^[ \t\r\n\r]/,
+      peg$c219 = peg$classExpectation([" ", "\t", "\r", "\n", "\r"], false, false),
+      peg$c220 = /^[ \t\r\n\r"]/,
+      peg$c221 = peg$classExpectation([" ", "\t", "\r", "\n", "\r", "\""], false, false),
+      peg$c222 = " ",
+      peg$c223 = peg$literalExpectation(" ", false),
+      peg$c224 = "#",
+      peg$c225 = peg$literalExpectation("#", false),
+      peg$c226 = function peg$c226() {
     return "#";
   },
-      peg$c221 = peg$otherExpectation("string"),
-      peg$c222 = function peg$c222(chars) {
+      peg$c227 = peg$otherExpectation("string"),
+      peg$c228 = function peg$c228(chars) {
     return {
       value: chars.join(''),
       type: 'string'
     };
   },
-      peg$c223 = "'''",
-      peg$c224 = peg$literalExpectation("'''", false),
-      peg$c225 = function peg$c225(chars) {
+      peg$c229 = "'''",
+      peg$c230 = peg$literalExpectation("'''", false),
+      peg$c231 = function peg$c231(chars) {
     var str = chars.join(''); // // replace line continuation using look around, but this is not compatible with firefox, safari.
     // str = str.replace(/(?<!\\)\\(?!\\)(?:\n|\r\n)?/g, ''); 
     // str = str.replace(/\\\\/, '\\');
@@ -960,55 +968,53 @@ function peg$parse(input, options) {
       type: 'string'
     };
   },
-      peg$c226 = "'",
-      peg$c227 = peg$literalExpectation("'", false),
-      peg$c228 = "\\",
-      peg$c229 = peg$literalExpectation("\\", false),
-      peg$c230 = function peg$c230() {
+      peg$c232 = "'",
+      peg$c233 = peg$literalExpectation("'", false),
+      peg$c234 = "\\",
+      peg$c235 = peg$literalExpectation("\\", false),
+      peg$c236 = function peg$c236() {
     return '"';
   },
-      peg$c231 = function peg$c231() {
+      peg$c237 = function peg$c237() {
     return text();
   },
-      peg$c232 = "\\'",
-      peg$c233 = peg$literalExpectation("\\'", false),
-      peg$c234 = function peg$c234() {
+      peg$c238 = "\\'",
+      peg$c239 = peg$literalExpectation("\\'", false),
+      peg$c240 = function peg$c240() {
     return "'";
   },
-      peg$c235 = function peg$c235(bl) {
+      peg$c241 = function peg$c241(bl) {
     // escape character \. \\n => \n. Remove one backslash in the result string.
     return bl.join('');
   },
-      peg$c236 = function peg$c236() {
+      peg$c242 = function peg$c242() {
     // replace line continuation
     return '';
   },
-      peg$c237 = /^[0-9]/,
-      peg$c238 = peg$classExpectation([["0", "9"]], false, false),
-      peg$c239 = "=",
-      peg$c240 = peg$literalExpectation("=", false),
-      peg$c241 = "true",
-      peg$c242 = peg$literalExpectation("true", true),
-      peg$c243 = "false",
-      peg$c244 = peg$literalExpectation("false", true),
-      peg$c245 = function peg$c245(_boolean) {
+      peg$c243 = /^[0-9]/,
+      peg$c244 = peg$classExpectation([["0", "9"]], false, false),
+      peg$c245 = "=",
+      peg$c246 = peg$literalExpectation("=", false),
+      peg$c247 = "true",
+      peg$c248 = peg$literalExpectation("true", true),
+      peg$c249 = "false",
+      peg$c250 = peg$literalExpectation("false", true),
+      peg$c251 = function peg$c251(_boolean) {
     return {
       type: 'boolean',
       value: _boolean
     };
   },
-      peg$c246 = "-",
-      peg$c247 = peg$literalExpectation("-", false),
-      peg$c248 = function peg$c248(minus, number) {
+      peg$c252 = function peg$c252(minus, number) {
     return {
       type: 'number',
       value: minus ? -number : number
     };
   },
-      peg$c249 = function peg$c249(left, right) {
+      peg$c253 = function peg$c253(left, right) {
     return parseFloat(left.join("") + "." + right.join(""));
   },
-      peg$c250 = function peg$c250(digits) {
+      peg$c254 = function peg$c254(digits) {
     return parseInt(digits.join(""), 10);
   },
       peg$currPos = 0,
@@ -5706,9 +5712,9 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (peg$c155.test(input.charAt(peg$currPos))) {
-      s0 = input.charAt(peg$currPos);
-      peg$currPos++;
+    if (input.substr(peg$currPos, 2) === peg$c155) {
+      s0 = peg$c155;
+      peg$currPos += 2;
     } else {
       s0 = peg$FAILED;
 
@@ -5717,6 +5723,45 @@ function peg$parse(input, options) {
       }
     }
 
+    if (s0 === peg$FAILED) {
+      if (input.charCodeAt(peg$currPos) === 62) {
+        s0 = peg$c157;
+        peg$currPos++;
+      } else {
+        s0 = peg$FAILED;
+
+        if (peg$silentFails === 0) {
+          peg$fail(peg$c158);
+        }
+      }
+
+      if (s0 === peg$FAILED) {
+        if (input.charCodeAt(peg$currPos) === 60) {
+          s0 = peg$c159;
+          peg$currPos++;
+        } else {
+          s0 = peg$FAILED;
+
+          if (peg$silentFails === 0) {
+            peg$fail(peg$c160);
+          }
+        }
+
+        if (s0 === peg$FAILED) {
+          if (input.charCodeAt(peg$currPos) === 45) {
+            s0 = peg$c161;
+            peg$currPos++;
+          } else {
+            s0 = peg$FAILED;
+
+            if (peg$silentFails === 0) {
+              peg$fail(peg$c162);
+            }
+          }
+        }
+      }
+    }
+
     peg$silentFails--;
 
     if (s0 === peg$FAILED) {
@@ -5748,7 +5793,7 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c158(s1);
+      s1 = peg$c164(s1);
     }
 
     s0 = s1;
@@ -5760,14 +5805,14 @@ function peg$parse(input, options) {
       if (s1 !== peg$FAILED) {
         s2 = [];
 
-        if (peg$c159.test(input.charAt(peg$currPos))) {
+        if (peg$c165.test(input.charAt(peg$currPos))) {
           s3 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c160);
+            peg$fail(peg$c166);
           }
         }
 
@@ -5775,14 +5820,14 @@ function peg$parse(input, options) {
           while (s3 !== peg$FAILED) {
             s2.push(s3);
 
-            if (peg$c159.test(input.charAt(peg$currPos))) {
+            if (peg$c165.test(input.charAt(peg$currPos))) {
               s3 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c160);
+                peg$fail(peg$c166);
               }
             }
           }
@@ -5795,7 +5840,7 @@ function peg$parse(input, options) {
 
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c158(s2);
+            s1 = peg$c164(s2);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -5817,7 +5862,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c157);
+        peg$fail(peg$c163);
       }
     }
 
@@ -5832,19 +5877,19 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 46) {
-        s2 = peg$c162;
+        s2 = peg$c168;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c163);
+          peg$fail(peg$c169);
         }
       }
 
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c164(s1);
+        s1 = peg$c170(s1);
         s0 = s1;
       } else {
         peg$currPos = s0;
@@ -5861,7 +5906,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c161);
+        peg$fail(peg$c167);
       }
     }
 
@@ -5875,13 +5920,13 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 46) {
-        s2 = peg$c162;
+        s2 = peg$c168;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c163);
+          peg$fail(peg$c169);
         }
       }
 
@@ -5890,13 +5935,13 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 46) {
-            s4 = peg$c162;
+            s4 = peg$c168;
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
 
             if (peg$silentFails === 0) {
-              peg$fail(peg$c163);
+              peg$fail(peg$c169);
             }
           }
 
@@ -5905,7 +5950,7 @@ function peg$parse(input, options) {
 
             if (s5 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c165(s1, s3, s5);
+              s1 = peg$c171(s1, s3, s5);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -5934,13 +5979,13 @@ function peg$parse(input, options) {
 
       if (s1 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 46) {
-          s2 = peg$c162;
+          s2 = peg$c168;
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c163);
+            peg$fail(peg$c169);
           }
         }
 
@@ -5949,7 +5994,7 @@ function peg$parse(input, options) {
 
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c166(s1, s3);
+            s1 = peg$c172(s1, s3);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -5975,13 +6020,13 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 46) {
-        s2 = peg$c162;
+        s2 = peg$c168;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c163);
+          peg$fail(peg$c169);
         }
       }
 
@@ -5990,13 +6035,13 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 46) {
-            s4 = peg$c162;
+            s4 = peg$c168;
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
 
             if (peg$silentFails === 0) {
-              peg$fail(peg$c163);
+              peg$fail(peg$c169);
             }
           }
 
@@ -6005,7 +6050,7 @@ function peg$parse(input, options) {
 
             if (s5 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c167(s1, s3, s5);
+              s1 = peg$c173(s1, s3, s5);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -6034,13 +6079,13 @@ function peg$parse(input, options) {
 
       if (s1 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 46) {
-          s2 = peg$c162;
+          s2 = peg$c168;
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c163);
+            peg$fail(peg$c169);
           }
         }
 
@@ -6049,7 +6094,7 @@ function peg$parse(input, options) {
 
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c168(s1, s3);
+            s1 = peg$c174(s1, s3);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -6086,7 +6131,7 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c158(s1);
+      s1 = peg$c164(s1);
     }
 
     s0 = s1;
@@ -6098,14 +6143,14 @@ function peg$parse(input, options) {
       if (s1 !== peg$FAILED) {
         s2 = [];
 
-        if (peg$c159.test(input.charAt(peg$currPos))) {
+        if (peg$c165.test(input.charAt(peg$currPos))) {
           s3 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c160);
+            peg$fail(peg$c166);
           }
         }
 
@@ -6113,14 +6158,14 @@ function peg$parse(input, options) {
           while (s3 !== peg$FAILED) {
             s2.push(s3);
 
-            if (peg$c159.test(input.charAt(peg$currPos))) {
+            if (peg$c165.test(input.charAt(peg$currPos))) {
               s3 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c160);
+                peg$fail(peg$c166);
               }
             }
           }
@@ -6133,7 +6178,7 @@ function peg$parse(input, options) {
 
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c158(s2);
+            s1 = peg$c164(s2);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -6155,7 +6200,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c157);
+        peg$fail(peg$c163);
       }
     }
 
@@ -6257,7 +6302,7 @@ function peg$parse(input, options) {
 
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c170(s1, s2);
+        s1 = peg$c176(s1, s2);
         s0 = s1;
       } else {
         peg$currPos = s0;
@@ -6274,7 +6319,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c169);
+        peg$fail(peg$c175);
       }
     }
 
@@ -6295,7 +6340,7 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c172(s1);
+      s1 = peg$c178(s1);
     }
 
     s0 = s1;
@@ -6305,7 +6350,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c171);
+        peg$fail(peg$c177);
       }
     }
 
@@ -6460,25 +6505,25 @@ function peg$parse(input, options) {
 
           if (s4 === peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 44) {
-              s4 = peg$c173;
+              s4 = peg$c179;
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c174);
+                peg$fail(peg$c180);
               }
             }
 
             if (s4 === peg$FAILED) {
-              if (input.substr(peg$currPos, 2) === peg$c175) {
-                s4 = peg$c175;
+              if (input.substr(peg$currPos, 2) === peg$c181) {
+                s4 = peg$c181;
                 peg$currPos += 2;
               } else {
                 s4 = peg$FAILED;
 
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$c176);
+                  peg$fail(peg$c182);
                 }
               }
 
@@ -6487,14 +6532,14 @@ function peg$parse(input, options) {
                 s5 = peg$parseendline();
 
                 if (s5 !== peg$FAILED) {
-                  if (input.substr(peg$currPos, 2) === peg$c175) {
-                    s6 = peg$c175;
+                  if (input.substr(peg$currPos, 2) === peg$c181) {
+                    s6 = peg$c181;
                     peg$currPos += 2;
                   } else {
                     s6 = peg$FAILED;
 
                     if (peg$silentFails === 0) {
-                      peg$fail(peg$c176);
+                      peg$fail(peg$c182);
                     }
                   }
 
@@ -6559,7 +6604,7 @@ function peg$parse(input, options) {
               s4 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c177);
+                peg$fail(peg$c183);
               }
             }
 
@@ -6589,7 +6634,7 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c178(s1);
+      s1 = peg$c184(s1);
     }
 
     s0 = s1;
@@ -6599,14 +6644,14 @@ function peg$parse(input, options) {
   function peg$parseexprChar() {
     var s0;
 
-    if (peg$c179.test(input.charAt(peg$currPos))) {
+    if (peg$c185.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c180);
+        peg$fail(peg$c186);
       }
     }
 
@@ -6628,14 +6673,14 @@ function peg$parse(input, options) {
   function peg$parseexprCharNoCommaSpace() {
     var s0;
 
-    if (peg$c181.test(input.charAt(peg$currPos))) {
+    if (peg$c187.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c182);
+        peg$fail(peg$c188);
       }
     }
 
@@ -6693,13 +6738,13 @@ function peg$parse(input, options) {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c177);
+          peg$fail(peg$c183);
         }
       }
 
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c183();
+        s1 = peg$c189();
         s0 = s1;
       } else {
         peg$currPos = s0;
@@ -6718,14 +6763,14 @@ function peg$parse(input, options) {
     s0 = peg$parsecharacter();
 
     if (s0 === peg$FAILED) {
-      if (peg$c184.test(input.charAt(peg$currPos))) {
+      if (peg$c190.test(input.charAt(peg$currPos))) {
         s0 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s0 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c185);
+          peg$fail(peg$c191);
         }
       }
     }
@@ -6737,14 +6782,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (peg$c187.test(input.charAt(peg$currPos))) {
+    if (peg$c193.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c188);
+        peg$fail(peg$c194);
       }
     }
 
@@ -6754,7 +6799,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c186);
+        peg$fail(peg$c192);
       }
     }
 
@@ -6765,20 +6810,20 @@ function peg$parse(input, options) {
     var s0, s1;
     s0 = peg$currPos;
 
-    if (peg$c189.test(input.charAt(peg$currPos))) {
+    if (peg$c195.test(input.charAt(peg$currPos))) {
       s1 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c190);
+        peg$fail(peg$c196);
       }
     }
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c191(s1);
+      s1 = peg$c197(s1);
     }
 
     s0 = s1;
@@ -6789,13 +6834,13 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 34) {
-      s0 = peg$c192;
+      s0 = peg$c198;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c193);
+        peg$fail(peg$c199);
       }
     }
 
@@ -6881,7 +6926,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c194);
+        peg$fail(peg$c200);
       }
     }
 
@@ -6892,13 +6937,13 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 9) {
-      s0 = peg$c195;
+      s0 = peg$c201;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c196);
+        peg$fail(peg$c202);
       }
     }
 
@@ -6909,42 +6954,42 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 2) === peg$c197) {
-      s1 = peg$c197;
+    if (input.substr(peg$currPos, 2) === peg$c203) {
+      s1 = peg$c203;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c198);
+        peg$fail(peg$c204);
       }
     }
 
     if (s1 !== peg$FAILED) {
       s2 = [];
 
-      if (peg$c199.test(input.charAt(peg$currPos))) {
+      if (peg$c205.test(input.charAt(peg$currPos))) {
         s3 = input.charAt(peg$currPos);
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c200);
+          peg$fail(peg$c206);
         }
       }
 
       while (s3 !== peg$FAILED) {
         s2.push(s3);
 
-        if (peg$c199.test(input.charAt(peg$currPos))) {
+        if (peg$c205.test(input.charAt(peg$currPos))) {
           s3 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c200);
+            peg$fail(peg$c206);
           }
         }
       }
@@ -6968,14 +7013,14 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 2) === peg$c201) {
-      s1 = peg$c201;
+    if (input.substr(peg$currPos, 2) === peg$c207) {
+      s1 = peg$c207;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c202);
+        peg$fail(peg$c208);
       }
     }
 
@@ -6985,14 +7030,14 @@ function peg$parse(input, options) {
       s4 = peg$currPos;
       peg$silentFails++;
 
-      if (input.substr(peg$currPos, 2) === peg$c203) {
-        s5 = peg$c203;
+      if (input.substr(peg$currPos, 2) === peg$c209) {
+        s5 = peg$c209;
         peg$currPos += 2;
       } else {
         s5 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c204);
+          peg$fail(peg$c210);
         }
       }
 
@@ -7013,7 +7058,7 @@ function peg$parse(input, options) {
           s5 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c177);
+            peg$fail(peg$c183);
           }
         }
 
@@ -7035,14 +7080,14 @@ function peg$parse(input, options) {
         s4 = peg$currPos;
         peg$silentFails++;
 
-        if (input.substr(peg$currPos, 2) === peg$c203) {
-          s5 = peg$c203;
+        if (input.substr(peg$currPos, 2) === peg$c209) {
+          s5 = peg$c209;
           peg$currPos += 2;
         } else {
           s5 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c204);
+            peg$fail(peg$c210);
           }
         }
 
@@ -7063,7 +7108,7 @@ function peg$parse(input, options) {
             s5 = peg$FAILED;
 
             if (peg$silentFails === 0) {
-              peg$fail(peg$c177);
+              peg$fail(peg$c183);
             }
           }
 
@@ -7081,14 +7126,14 @@ function peg$parse(input, options) {
       }
 
       if (s2 !== peg$FAILED) {
-        if (input.substr(peg$currPos, 2) === peg$c203) {
-          s3 = peg$c203;
+        if (input.substr(peg$currPos, 2) === peg$c209) {
+          s3 = peg$c209;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c204);
+            peg$fail(peg$c210);
           }
         }
 
@@ -7126,7 +7171,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c205);
+        peg$fail(peg$c211);
       }
     }
 
@@ -7137,26 +7182,26 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (input.substr(peg$currPos, 2) === peg$c207) {
-      s0 = peg$c207;
+    if (input.substr(peg$currPos, 2) === peg$c213) {
+      s0 = peg$c213;
       peg$currPos += 2;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c208);
+        peg$fail(peg$c214);
       }
     }
 
     if (s0 === peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 10) {
-        s0 = peg$c209;
+        s0 = peg$c215;
         peg$currPos++;
       } else {
         s0 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c210);
+          peg$fail(peg$c216);
         }
       }
     }
@@ -7167,7 +7212,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c206);
+        peg$fail(peg$c212);
       }
     }
 
@@ -7178,14 +7223,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (peg$c212.test(input.charAt(peg$currPos))) {
+    if (peg$c218.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c213);
+        peg$fail(peg$c219);
       }
     }
 
@@ -7195,7 +7240,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c211);
+        peg$fail(peg$c217);
       }
     }
 
@@ -7206,14 +7251,14 @@ function peg$parse(input, options) {
     var s0, s1;
     peg$silentFails++;
 
-    if (peg$c214.test(input.charAt(peg$currPos))) {
+    if (peg$c220.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c215);
+        peg$fail(peg$c221);
       }
     }
 
@@ -7223,7 +7268,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c211);
+        peg$fail(peg$c217);
       }
     }
 
@@ -7234,13 +7279,13 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 32) {
-      s0 = peg$c216;
+      s0 = peg$c222;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c217);
+        peg$fail(peg$c223);
       }
     }
 
@@ -7251,13 +7296,13 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 44) {
-      s0 = peg$c173;
+      s0 = peg$c179;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c174);
+        peg$fail(peg$c180);
       }
     }
 
@@ -7269,19 +7314,19 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 35) {
-      s1 = peg$c218;
+      s1 = peg$c224;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c219);
+        peg$fail(peg$c225);
       }
     }
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c220();
+      s1 = peg$c226();
     }
 
     s0 = s1;
@@ -7294,13 +7339,13 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 34) {
-      s1 = peg$c192;
+      s1 = peg$c198;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c193);
+        peg$fail(peg$c199);
       }
     }
 
@@ -7315,19 +7360,19 @@ function peg$parse(input, options) {
 
       if (s2 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 34) {
-          s3 = peg$c192;
+          s3 = peg$c198;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c193);
+            peg$fail(peg$c199);
           }
         }
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c222(s2);
+          s1 = peg$c228(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -7345,14 +7390,14 @@ function peg$parse(input, options) {
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
 
-      if (input.substr(peg$currPos, 3) === peg$c223) {
-        s1 = peg$c223;
+      if (input.substr(peg$currPos, 3) === peg$c229) {
+        s1 = peg$c229;
         peg$currPos += 3;
       } else {
         s1 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c224);
+          peg$fail(peg$c230);
         }
       }
 
@@ -7366,20 +7411,20 @@ function peg$parse(input, options) {
         }
 
         if (s2 !== peg$FAILED) {
-          if (input.substr(peg$currPos, 3) === peg$c223) {
-            s3 = peg$c223;
+          if (input.substr(peg$currPos, 3) === peg$c229) {
+            s3 = peg$c229;
             peg$currPos += 3;
           } else {
             s3 = peg$FAILED;
 
             if (peg$silentFails === 0) {
-              peg$fail(peg$c224);
+              peg$fail(peg$c230);
             }
           }
 
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c225(s2);
+            s1 = peg$c231(s2);
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -7398,13 +7443,13 @@ function peg$parse(input, options) {
         s0 = peg$currPos;
 
         if (input.charCodeAt(peg$currPos) === 39) {
-          s1 = peg$c226;
+          s1 = peg$c232;
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c227);
+            peg$fail(peg$c233);
           }
         }
 
@@ -7419,19 +7464,19 @@ function peg$parse(input, options) {
 
           if (s2 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 39) {
-              s3 = peg$c226;
+              s3 = peg$c232;
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c227);
+                peg$fail(peg$c233);
               }
             }
 
             if (s3 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c222(s2);
+              s1 = peg$c228(s2);
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -7454,7 +7499,7 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c221);
+        peg$fail(peg$c227);
       }
     }
 
@@ -7466,31 +7511,31 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 92) {
-      s1 = peg$c228;
+      s1 = peg$c234;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c229);
+        peg$fail(peg$c235);
       }
     }
 
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 34) {
-        s2 = peg$c192;
+        s2 = peg$c198;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c193);
+          peg$fail(peg$c199);
         }
       }
 
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c230();
+        s1 = peg$c236();
         s0 = s1;
       } else {
         peg$currPos = s0;
@@ -7507,13 +7552,13 @@ function peg$parse(input, options) {
       peg$silentFails++;
 
       if (input.charCodeAt(peg$currPos) === 34) {
-        s2 = peg$c192;
+        s2 = peg$c198;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c193);
+          peg$fail(peg$c199);
         }
       }
 
@@ -7531,7 +7576,7 @@ function peg$parse(input, options) {
 
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c231();
+          s1 = peg$c237();
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -7550,20 +7595,20 @@ function peg$parse(input, options) {
     var s0, s1, s2;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 2) === peg$c232) {
-      s1 = peg$c232;
+    if (input.substr(peg$currPos, 2) === peg$c238) {
+      s1 = peg$c238;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c233);
+        peg$fail(peg$c239);
       }
     }
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c234();
+      s1 = peg$c240();
     }
 
     s0 = s1;
@@ -7574,13 +7619,13 @@ function peg$parse(input, options) {
       peg$silentFails++;
 
       if (input.charCodeAt(peg$currPos) === 39) {
-        s2 = peg$c226;
+        s2 = peg$c232;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c227);
+          peg$fail(peg$c233);
         }
       }
 
@@ -7598,7 +7643,7 @@ function peg$parse(input, options) {
 
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c231();
+          s1 = peg$c237();
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -7617,20 +7662,20 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 2) === peg$c232) {
-      s1 = peg$c232;
+    if (input.substr(peg$currPos, 2) === peg$c238) {
+      s1 = peg$c238;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c233);
+        peg$fail(peg$c239);
       }
     }
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c234();
+      s1 = peg$c240();
     }
 
     s0 = s1;
@@ -7639,13 +7684,13 @@ function peg$parse(input, options) {
       s0 = peg$currPos;
 
       if (input.charCodeAt(peg$currPos) === 92) {
-        s1 = peg$c228;
+        s1 = peg$c234;
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c229);
+          peg$fail(peg$c235);
         }
       }
 
@@ -7653,13 +7698,13 @@ function peg$parse(input, options) {
         s2 = [];
 
         if (input.charCodeAt(peg$currPos) === 92) {
-          s3 = peg$c228;
+          s3 = peg$c234;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c229);
+            peg$fail(peg$c235);
           }
         }
 
@@ -7668,13 +7713,13 @@ function peg$parse(input, options) {
             s2.push(s3);
 
             if (input.charCodeAt(peg$currPos) === 92) {
-              s3 = peg$c228;
+              s3 = peg$c234;
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c229);
+                peg$fail(peg$c235);
               }
             }
           }
@@ -7684,7 +7729,7 @@ function peg$parse(input, options) {
 
         if (s2 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c235(s2);
+          s1 = peg$c241(s2);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -7699,25 +7744,25 @@ function peg$parse(input, options) {
         s0 = peg$currPos;
 
         if (input.charCodeAt(peg$currPos) === 92) {
-          s1 = peg$c228;
+          s1 = peg$c234;
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c229);
+            peg$fail(peg$c235);
           }
         }
 
         if (s1 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 10) {
-            s2 = peg$c209;
+            s2 = peg$c215;
             peg$currPos++;
           } else {
             s2 = peg$FAILED;
 
             if (peg$silentFails === 0) {
-              peg$fail(peg$c210);
+              peg$fail(peg$c216);
             }
           }
 
@@ -7727,7 +7772,7 @@ function peg$parse(input, options) {
 
           if (s2 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$c236();
+            s1 = peg$c242();
             s0 = s1;
           } else {
             peg$currPos = s0;
@@ -7743,14 +7788,14 @@ function peg$parse(input, options) {
           s1 = peg$currPos;
           peg$silentFails++;
 
-          if (input.substr(peg$currPos, 3) === peg$c223) {
-            s2 = peg$c223;
+          if (input.substr(peg$currPos, 3) === peg$c229) {
+            s2 = peg$c229;
             peg$currPos += 3;
           } else {
             s2 = peg$FAILED;
 
             if (peg$silentFails === 0) {
-              peg$fail(peg$c224);
+              peg$fail(peg$c230);
             }
           }
 
@@ -7768,7 +7813,7 @@ function peg$parse(input, options) {
 
             if (s2 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$c231();
+              s1 = peg$c237();
               s0 = s1;
             } else {
               peg$currPos = s0;
@@ -7795,7 +7840,7 @@ function peg$parse(input, options) {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c177);
+        peg$fail(peg$c183);
       }
     }
 
@@ -7805,14 +7850,14 @@ function peg$parse(input, options) {
   function peg$parsedigit() {
     var s0;
 
-    if (peg$c237.test(input.charAt(peg$currPos))) {
+    if (peg$c243.test(input.charAt(peg$currPos))) {
       s0 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c238);
+        peg$fail(peg$c244);
       }
     }
 
@@ -7823,13 +7868,13 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 61) {
-      s0 = peg$c239;
+      s0 = peg$c245;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c240);
+        peg$fail(peg$c246);
       }
     }
 
@@ -7840,13 +7885,13 @@ function peg$parse(input, options) {
     var s0;
 
     if (input.charCodeAt(peg$currPos) === 46) {
-      s0 = peg$c162;
+      s0 = peg$c168;
       peg$currPos++;
     } else {
       s0 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c163);
+        peg$fail(peg$c169);
       }
     }
 
@@ -7857,26 +7902,26 @@ function peg$parse(input, options) {
     var s0, s1;
     s0 = peg$currPos;
 
-    if (input.substr(peg$currPos, 4).toLowerCase() === peg$c241) {
+    if (input.substr(peg$currPos, 4).toLowerCase() === peg$c247) {
       s1 = input.substr(peg$currPos, 4);
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c242);
+        peg$fail(peg$c248);
       }
     }
 
     if (s1 === peg$FAILED) {
-      if (input.substr(peg$currPos, 5).toLowerCase() === peg$c243) {
+      if (input.substr(peg$currPos, 5).toLowerCase() === peg$c249) {
         s1 = input.substr(peg$currPos, 5);
         peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c244);
+          peg$fail(peg$c250);
         }
       }
 
@@ -7896,7 +7941,7 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c245(s1);
+      s1 = peg$c251(s1);
     }
 
     s0 = s1;
@@ -7908,13 +7953,13 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
 
     if (input.charCodeAt(peg$currPos) === 45) {
-      s1 = peg$c246;
+      s1 = peg$c161;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c247);
+        peg$fail(peg$c162);
       }
     }
 
@@ -7931,7 +7976,7 @@ function peg$parse(input, options) {
 
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$c248(s1, s2);
+        s1 = peg$c252(s1, s2);
         s0 = s1;
       } else {
         peg$currPos = s0;
@@ -7950,14 +7995,14 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = [];
 
-    if (peg$c237.test(input.charAt(peg$currPos))) {
+    if (peg$c243.test(input.charAt(peg$currPos))) {
       s2 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c238);
+        peg$fail(peg$c244);
       }
     }
 
@@ -7965,14 +8010,14 @@ function peg$parse(input, options) {
       while (s2 !== peg$FAILED) {
         s1.push(s2);
 
-        if (peg$c237.test(input.charAt(peg$currPos))) {
+        if (peg$c243.test(input.charAt(peg$currPos))) {
           s2 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c238);
+            peg$fail(peg$c244);
           }
         }
       }
@@ -7982,27 +8027,27 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 46) {
-        s2 = peg$c162;
+        s2 = peg$c168;
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
 
         if (peg$silentFails === 0) {
-          peg$fail(peg$c163);
+          peg$fail(peg$c169);
         }
       }
 
       if (s2 !== peg$FAILED) {
         s3 = [];
 
-        if (peg$c237.test(input.charAt(peg$currPos))) {
+        if (peg$c243.test(input.charAt(peg$currPos))) {
           s4 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c238);
+            peg$fail(peg$c244);
           }
         }
 
@@ -8010,14 +8055,14 @@ function peg$parse(input, options) {
           while (s4 !== peg$FAILED) {
             s3.push(s4);
 
-            if (peg$c237.test(input.charAt(peg$currPos))) {
+            if (peg$c243.test(input.charAt(peg$currPos))) {
               s4 = input.charAt(peg$currPos);
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
 
               if (peg$silentFails === 0) {
-                peg$fail(peg$c238);
+                peg$fail(peg$c244);
               }
             }
           }
@@ -8027,7 +8072,7 @@ function peg$parse(input, options) {
 
         if (s3 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$c249(s1, s3);
+          s1 = peg$c253(s1, s3);
           s0 = s1;
         } else {
           peg$currPos = s0;
@@ -8050,14 +8095,14 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = [];
 
-    if (peg$c237.test(input.charAt(peg$currPos))) {
+    if (peg$c243.test(input.charAt(peg$currPos))) {
       s2 = input.charAt(peg$currPos);
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
 
       if (peg$silentFails === 0) {
-        peg$fail(peg$c238);
+        peg$fail(peg$c244);
       }
     }
 
@@ -8065,14 +8110,14 @@ function peg$parse(input, options) {
       while (s2 !== peg$FAILED) {
         s1.push(s2);
 
-        if (peg$c237.test(input.charAt(peg$currPos))) {
+        if (peg$c243.test(input.charAt(peg$currPos))) {
           s2 = input.charAt(peg$currPos);
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
 
           if (peg$silentFails === 0) {
-            peg$fail(peg$c238);
+            peg$fail(peg$c244);
           }
         }
       }
@@ -8082,7 +8127,7 @@ function peg$parse(input, options) {
 
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$c250(s1);
+      s1 = peg$c254(s1);
     }
 
     s0 = s1;
@@ -8099,6 +8144,14 @@ function peg$parse(input, options) {
     project: {}
   };
   var projectCnt = 0;
+
+  function getRelations(operator) {
+    if (operator === '<>') return ['*', '*'];
+    if (operator === '>') return ['*', '1'];
+    if (operator === '<') return ['1', '*'];
+    if (operator === '-') return ['1', '1'];
+  }
+
   peg$result = peg$startRuleFunction();
 
   if (peg$result !== peg$FAILED && peg$currPos === input.length) {