@fraczak/k 3.0.1 → 3.1.0

package/codes.mjs

@@ -1,11 +1,17 @@
+import hash from "./hash.mjs";
+
+
+const theRepository = { codes: {  } };
+
+const unitCode = function() {
+  const unitCodeDef = encodeCodeToString("{}", { "{}": { code: "product", product: [] } });
+  return hash(unitCodeDef);
+}();
+
 function isBuiltIn(code) {  
   return code.match(/^(int|string|bool)$/);
 }
 
-function logCeiling(n, base = 2) {
-  return Math.ceil(Math.log(n) / Math.log(base));
-}
-
 function encodeCodeToString(code, codes) {
   if (isBuiltIn(code)) return code;
   var i = 0;
@@ -86,9 +92,9 @@ function are_different(classes, representatives, name1, name2, codes) {
 function minimize(codes) {
   const names = Object.keys(codes);
   const classes = {};
-  classes["{}"] = names;
+  classes[unitCode] = names;
   const representatives = names.reduce((representatives, name) => {
-    representatives[name] = "{}";
+    representatives[name] = unitCode;
     return representatives;
   }, {});
   let changed = true;
@@ -153,6 +159,52 @@ function normalizeAll(codes, representatives) {
   }, {});
 }
 
+function finalize(codes) {
+  const representatives = minimize(codes).representatives;
+  const normalizedCodes = normalizeAll(codes, representatives);
+  const globalNames = Object.keys(normalizedCodes).reduce((globalNames, name) => {
+    const globalDef = encodeCodeToString(name, normalizedCodes);
+    normalizedCodes[name].def = globalDef;
+    globalNames[name] = hash(globalDef);
+    return globalNames;
+  }, {});
+  const globalCodes = Object.keys(normalizedCodes).reduce((globalCodes, name) => {
+    globalCodes[globalNames[name]] = normalizedCodes[name];
+    return globalCodes;
+  },{});
+  // console.log("globalCodes",globalCodes);
+
+  const extendedRepresentatives = Object.keys(representatives).reduce((result, name) => {
+    result[name] = globalNames[representatives[name]] || name;
+    return result;
+  }, Object.values(globalNames).reduce((result, name) => ({[name]: name, ...result}),{}));
+  // console.log("extendedRepresentatives",extendedRepresentatives);
+
+  const normalizedGlobalCodes = normalizeAll(globalCodes, extendedRepresentatives);
+  // console.log("normalizedGlobalCodes",normalizedGlobalCodes);
+
+  return {
+    codes: normalizedGlobalCodes,
+    representatives: extendedRepresentatives
+  };
+}
+
+function register(newCodes) {
+  const { codes, representatives } = finalize( {...newCodes,...theRepository.codes});
+  const reps = Object.values(representatives).reduce((reps,rep) => 
+    ({...reps, [rep]:rep})
+  , {});
+  for (const rep in reps) {
+    theRepository.codes[rep] = codes[rep];
+  };
+  return representatives;
+}
+
+function find(codeName) {
+  if (isBuiltIn(codeName))
+    return {code: codeName, def: "built-in["+codeName+"]"};
+  return JSON.parse(JSON.stringify(theRepository.codes[codeName]));
+};
 
-export default { minimize, normalize, normalizeAll, encodeCodeToString };
-export { minimize, normalize, normalizeAll, encodeCodeToString };
+export default { minimize, normalize, normalizeAll, encodeCodeToString, finalize, unitCode, register, find };
+export { minimize, normalize, normalizeAll, encodeCodeToString, finalize, unitCode, register, find };

package/hash.mjs

@@ -22,13 +22,14 @@ function shifString(baseString) {
 
 function hash(inputString) {
     if (inputString.match(/^\$C0=.*;$/))
-        inputString = inputString.slice(4,-1);
-    let hashValue = 0;
-    const prime = 31;
-    const mod = 1000000000039;
+        inputString = inputString.slice(4, -1);
+    
+    let hashValue = BigInt(0);
+    const prime = BigInt(2);
+    const mod = BigInt('8494462356974657160929849007317');
 
     for (let i = 0; i < inputString.length; i++) {
-        let charCode = inputString.charCodeAt(i);
+        let charCode = BigInt(inputString.charCodeAt(i));
         hashValue = (hashValue * prime + charCode) % mod;
     }
 

package/index.mjs

@@ -2,53 +2,22 @@ import { parse } from "./parser.mjs";
 import { patterns } from "./patterns.mjs";
 import run from "./run.mjs";
 import t from "./codes.mjs";
-import hash from "./hash.mjs";
-
-function finalize(codes) {
-  const representatives = t.minimize(codes).representatives;
-  const normalizedCodes = t.normalizeAll(codes, representatives);
-  const globalNames = Object.keys(normalizedCodes).reduce((globalNames, name) => {
-    const globalDef = t.encodeCodeToString(name, normalizedCodes);
-    normalizedCodes[name].def = globalDef;
-    globalNames[name] = hash(globalDef);
-    return globalNames;
-  }, {});
-  const globalCodes = Object.keys(normalizedCodes).reduce((globalCodes, name) => {
-    globalCodes[globalNames[name]] = normalizedCodes[name];
-    return globalCodes;
-  },{});
-  // console.log("globalCodes",globalCodes);
-
-  const extendedRepresentatives = Object.keys(representatives).reduce((result, name) => {
-    result[name] = globalNames[representatives[name]] || name;
-    return result;
-  }, Object.values(globalNames).reduce((result, name) => ({[name]: name, ...result}),{}));
-  // console.log("extendedRepresentatives",extendedRepresentatives);
-
-  const normalizedGlobalCodes = t.normalizeAll(globalCodes, extendedRepresentatives);
-  // console.log("normalizedGlobalCodes",normalizedGlobalCodes);
-
-  
-  return {
-    codes: normalizedGlobalCodes,
-    representatives: extendedRepresentatives
-  };
-}
 
 function compile(script) {
   try {
     run.defs = annotate(script);
   } catch (e) {
     console.error(e);
+    console.error("WARN: Recompiling without type reconciliation due to the type error above.");
     const { defs, exp } = parse(script);
-    const { codes, representatives } = finalize(defs.codes);
+    const { codes, representatives } = t.finalize(defs.codes);
     run.defs = {
-      rels: {...defs.rels, "__main__": [exp]}, 
+      rels: {...defs.rels, "__main__": {def: exp}}, 
       codes, representatives
     };
-    console.error("WARN: Recompiled without type reconciliation due to the type error above.");
+    
   }
-  return run.bind(null, run.defs.rels.__main__[0]);
+  return run.bind(null, run.defs.rels.__main__.def);
 }
 
 compile.doc = "Transforms k-script (string) into a function";
@@ -61,9 +30,9 @@ runScriptOnData.doc = "Run 'script' (string) on 'data': (script,data) -> data";
 
 function annotate(script) {
   const { defs, exp } = parse(script);
-  const { codes, representatives } = finalize(defs.codes);
+  const { codes, representatives } = t.finalize(defs.codes);
 
-  const rels = {...defs.rels, "__main__": [exp]};
+  const rels = {...defs.rels, "__main__": {def: exp}};
 
   const pats = patterns(codes, representatives, rels);
  

package/k.mjs

@@ -1,10 +1,10 @@
-#!/usr/bin/env node
+#!/usr/bin/node --stack-size=8000
+// #!/usr/bin/env node
+// !/usr/bin/node --stack-size=8000
 
 import fs from "node:fs";
 import k from "./index.mjs";
 
-const splice = [].splice;
-
 const prog = process.argv[1];
 
 let kScript, jsonStream, oneJson;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fraczak/k",
-    "version": "3.0.1",
+    "version": "3.1.0",
     "description": "k-language for JSON-like data transformation",
     "main": "index.mjs",
     "scripts": {

package/parser.jison

@@ -1,6 +1,7 @@
 %{
 
-import s from "./symbol-table.mjs";
+import { SymbolTable, comp, union, identity } from "./symbol-table.mjs";
+let s = new SymbolTable();
 
 function getToken(yytext,yy,lstack) {
     const yylloc = yy.lexer.yylloc;
@@ -61,6 +62,7 @@ function fromEscString(escString) {
 \"([^"\\]|\\(.|\n))*\"|\'([^'\\]|\\(.|\n))*\'  return 'STRING';
 [a-zA-Z_][a-zA-Z0-9_?!]*                       return 'NAME';
 0|[-]?[1-9][0-9]*                              return 'INT';
+"+++"                                          return 'INCREMENTAL';
 <<EOF>>                                        return 'EOF';
 
 /lex
@@ -92,14 +94,20 @@ sc: SC                                  { $$ = getToken(yytext,yy,_$); };
 col: COL                                { $$ = getToken(yytext,yy,_$); };
 dollar: DOLLAR                          { $$ = getToken(yytext,yy,_$); };
 qmark: QMARK                            { $$ = getToken(yytext,yy,_$); };
+incremental: INCREMENTAL                { $$ = getToken(yytext,yy,_$); };
 
-input_with_eof: defs comp EOF               {
-    const result = {defs: {rels: s.rels, codes: s.codes}, exp: $2};
+input_with_eof: initialize_symbol_table defs comp EOF               {
+    const result = {defs: {rels: s.rels, codes: s.codes}, exp: $3};
     // console.log(JSON.stringify(result, "", 2));
     // process.exit(0);
     return result;
 };
 
+initialize_symbol_table
+    :                                   { s = new SymbolTable();}
+    | incremental                       {  }
+    ;
+
 defs:                                   {  }
     | defs name eq comp sc              { s.add_rel($2.value,$4); }
     | defs dollar name eq codeDef SC    { s.add_code($3.value,$5); }
@@ -178,16 +186,16 @@ filter_label
 
 comp 
     : exp                               { $$ = $1; }
-    | comp exp                          { $$ = {...s.comp($1, $2), start: $1.start, end:$2.end}; }
+    | comp exp                          { $$ = {...comp($1, $2), start: $1.start, end:$2.end}; }
     | comp CARET                        { $$ = {op: 'caret', caret: $1, start: $1.start, end:$2.end}; }
     ;
 
 exp
     : lc labelled rc                    { $$ = {...$2, start: $1.start, end: $3.end}; }
     | lb list rb                        { $$ = {op: "vector", vector: $2, start: $1.start, end: $3.end}; }
-    | la list ra                        { $$ = {...s.union($2), start: $1.start, end: $3.end}; }
+    | la list ra                        { $$ = {...union($2), start: $1.start, end: $3.end}; }
     | name                              { $$ = {op: "ref", ref: $1.value, start: $1.start, end: $1.end}; }
-    | lp rp                             { $$ = {...s.identity, start: $1.start, end: $2.end};  }
+    | lp rp                             { $$ = {...identity, start: $1.start, end: $2.end};  }
     | lp comp rp                        { $$ = {...$2, start: $1.start, end: $3.end };  }
     | str                               { $$ = {op: "str", str: $1.value, start: $1.start, end: $1.end }; }
     | int                               { $$ = {op: "int", int: $1.value, start: $1.start, end: $1.end }; }

package/parser.mjs

@@ -75,7 +75,8 @@
 
 
 
-import s from "./symbol-table.mjs";
+import { SymbolTable, comp, union, identity } from "./symbol-table.mjs";
+let s = new SymbolTable();
 
 function getToken(yytext,yy,lstack) {
     const yylloc = yy.lexer.yylloc;
@@ -110,18 +111,18 @@ function fromEscString(escString) {
 
 
 var parser = (function(){
-var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[4,6,8,10,12,14,16,30,38,40,58],$V1=[1,7],$V2=[1,22],$V3=[1,23],$V4=[1,20],$V5=[1,18],$V6=[1,19],$V7=[1,21],$V8=[1,24],$V9=[1,8],$Va=[1,25],$Vb=[1,17],$Vc=[1,28],$Vd=[4,6,8,10,12,14,16,30,38,40,44,55,58],$Ve=[2,62],$Vf=[1,32],$Vg=[4,6,8,10,12,14,16,18,20,22,24,30,32,34,38,40,44,55,58],$Vh=[2,83],$Vi=[1,52],$Vj=[2,65],$Vk=[2,66],$Vl=[4,6,8,10,12,14,16,18,20,22,24,30,32,34,36,38,40,44,55,58],$Vm=[4,6,8],$Vn=[2,24],$Vo=[2,29],$Vp=[1,76],$Vq=[1,78],$Vr=[20,32],$Vs=[4,6,8,10,12,14,16,30,38,40,55,58],$Vt=[1,83],$Vu=[1,87],$Vv=[18,22,32],$Vw=[1,90],$Vx=[2,39],$Vy=[2,45],$Vz=[1,101],$VA=[18,20,32],$VB=[2,77],$VC=[2,78],$VD=[2,79],$VE=[18,20,24,32];
+var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[4,6,8,10,12,14,16,30,38,40,61],$V1=[1,10],$V2=[1,25],$V3=[1,26],$V4=[1,23],$V5=[1,21],$V6=[1,22],$V7=[1,24],$V8=[1,27],$V9=[1,11],$Va=[1,28],$Vb=[1,20],$Vc=[1,31],$Vd=[4,6,8,10,12,14,16,30,38,40,47,58,61],$Ve=[2,65],$Vf=[1,35],$Vg=[4,6,8,10,12,14,16,18,20,22,24,30,32,34,38,40,47,58,61],$Vh=[2,86],$Vi=[1,55],$Vj=[2,68],$Vk=[2,69],$Vl=[4,6,8,10,12,14,16,18,20,22,24,30,32,34,36,38,40,47,58,61],$Vm=[4,6,8],$Vn=[2,27],$Vo=[2,32],$Vp=[1,79],$Vq=[1,81],$Vr=[20,32],$Vs=[4,6,8,10,12,14,16,30,38,40,58,61],$Vt=[1,86],$Vu=[1,90],$Vv=[18,22,32],$Vw=[1,93],$Vx=[2,42],$Vy=[2,48],$Vz=[1,104],$VA=[18,20,32],$VB=[2,80],$VC=[2,81],$VD=[2,82],$VE=[18,20,24,32];
 var parser = {trace: function trace () { },
 yy: {},
-symbols_: {"error":2,"name":3,"NAME":4,"str":5,"STRING":6,"int":7,"INT":8,"la":9,"LA":10,"lc":11,"LC":12,"lb":13,"LB":14,"lp":15,"LP":16,"ra":17,"RA":18,"rc":19,"RC":20,"rb":21,"RB":22,"rp":23,"RP":24,"eq":25,"EQ":26,"dots":27,"DOTS":28,"dot":29,"DOT":30,"comma":31,"COMMA":32,"sc":33,"SC":34,"col":35,"COL":36,"dollar":37,"DOLLAR":38,"qmark":39,"QMARK":40,"input_with_eof":41,"defs":42,"comp":43,"EOF":44,"codeDef":45,"code":46,"labelled_codes":47,"non_empty_labelled_codes":48,"code_label":49,"filter":50,"labelled_filters":51,"non_empty_labelled_filters":52,"filter_label":53,"exp":54,"CARET":55,"labelled":56,"list":57,"PIPE":58,"non_empty_labelled":59,"comp_label":60,"non_empty_list":61,"$accept":0,"$end":1},
-terminals_: {2:"error",4:"NAME",6:"STRING",8:"INT",10:"LA",12:"LC",14:"LB",16:"LP",18:"RA",20:"RC",22:"RB",24:"RP",26:"EQ",28:"DOTS",30:"DOT",32:"COMMA",34:"SC",36:"COL",38:"DOLLAR",40:"QMARK",44:"EOF",55:"CARET",58:"PIPE"},
-productions_: [0,[3,1],[5,1],[7,1],[9,1],[11,1],[13,1],[15,1],[17,1],[19,1],[21,1],[23,1],[25,1],[27,1],[29,1],[31,1],[33,1],[35,1],[37,1],[39,1],[41,3],[42,0],[42,5],[42,6],[46,1],[46,1],[45,3],[45,3],[45,3],[47,0],[47,1],[48,1],[48,3],[49,2],[49,2],[49,2],[49,3],[49,3],[49,3],[50,1],[50,2],[50,3],[50,3],[50,3],[50,3],[51,0],[51,1],[52,1],[52,3],[53,1],[53,2],[53,2],[53,2],[53,3],[53,3],[53,3],[43,1],[43,2],[43,2],[54,3],[54,3],[54,3],[54,1],[54,2],[54,3],[54,1],[54,1],[54,2],[54,2],[54,2],[54,2],[54,2],[54,1],[56,0],[56,1],[59,1],[59,3],[60,2],[60,2],[60,2],[60,3],[60,3],[60,3],[57,0],[57,1],[61,1],[61,3]],
+symbols_: {"error":2,"name":3,"NAME":4,"str":5,"STRING":6,"int":7,"INT":8,"la":9,"LA":10,"lc":11,"LC":12,"lb":13,"LB":14,"lp":15,"LP":16,"ra":17,"RA":18,"rc":19,"RC":20,"rb":21,"RB":22,"rp":23,"RP":24,"eq":25,"EQ":26,"dots":27,"DOTS":28,"dot":29,"DOT":30,"comma":31,"COMMA":32,"sc":33,"SC":34,"col":35,"COL":36,"dollar":37,"DOLLAR":38,"qmark":39,"QMARK":40,"incremental":41,"INCREMENTAL":42,"input_with_eof":43,"initialize_symbol_table":44,"defs":45,"comp":46,"EOF":47,"codeDef":48,"code":49,"labelled_codes":50,"non_empty_labelled_codes":51,"code_label":52,"filter":53,"labelled_filters":54,"non_empty_labelled_filters":55,"filter_label":56,"exp":57,"CARET":58,"labelled":59,"list":60,"PIPE":61,"non_empty_labelled":62,"comp_label":63,"non_empty_list":64,"$accept":0,"$end":1},
+terminals_: {2:"error",4:"NAME",6:"STRING",8:"INT",10:"LA",12:"LC",14:"LB",16:"LP",18:"RA",20:"RC",22:"RB",24:"RP",26:"EQ",28:"DOTS",30:"DOT",32:"COMMA",34:"SC",36:"COL",38:"DOLLAR",40:"QMARK",42:"INCREMENTAL",47:"EOF",58:"CARET",61:"PIPE"},
+productions_: [0,[3,1],[5,1],[7,1],[9,1],[11,1],[13,1],[15,1],[17,1],[19,1],[21,1],[23,1],[25,1],[27,1],[29,1],[31,1],[33,1],[35,1],[37,1],[39,1],[41,1],[43,4],[44,0],[44,1],[45,0],[45,5],[45,6],[49,1],[49,1],[48,3],[48,3],[48,3],[50,0],[50,1],[51,1],[51,3],[52,2],[52,2],[52,2],[52,3],[52,3],[52,3],[53,1],[53,2],[53,3],[53,3],[53,3],[53,3],[54,0],[54,1],[55,1],[55,3],[56,1],[56,2],[56,2],[56,2],[56,3],[56,3],[56,3],[46,1],[46,2],[46,2],[57,3],[57,3],[57,3],[57,1],[57,2],[57,3],[57,1],[57,1],[57,2],[57,2],[57,2],[57,2],[57,2],[57,1],[59,0],[59,1],[62,1],[62,3],[63,2],[63,2],[63,2],[63,3],[63,3],[63,3],[60,0],[60,1],[64,1],[64,3]],
 performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
 /* this == yyval */
 
 var $0 = $$.length - 1;
 switch (yystate) {
-case 1: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15: case 16: case 17: case 18: case 19:
+case 1: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15: case 16: case 17: case 18: case 19: case 20:
  this.$ = getToken(yytext,yy,_$); 
 break;
 case 2:
@@ -130,7 +131,7 @@ break;
 case 3:
  this.$ = getToken(yytext,yy,_$); this.$.value = parseInt(this.$.value); 
 break;
-case 20:
+case 21:
 
     const result = {defs: {rels: s.rels, codes: s.codes}, exp: $$[$0-1]};
     // console.log(JSON.stringify(result, "", 2));
@@ -138,73 +139,76 @@ case 20:
     return result;
 
 break;
-case 21:
+case 22:
+ s = new SymbolTable();
+break;
+case 23: case 24:
   
 break;
-case 22:
+case 25:
  s.add_rel($$[$0-3].value,$$[$0-1]); 
 break;
-case 23:
+case 26:
  s.add_code($$[$0-3].value,$$[$0-1]); 
 break;
-case 24:
+case 27:
  this.$ = { code: "ref", ref: $$[$0].value, start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 25: case 56: case 74: case 84:
+case 28: case 59: case 77: case 87:
  this.$ = $$[$0]; 
 break;
-case 26:
+case 29:
  this.$ = { code: "product", product: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end }; 
 break;
-case 27:
+case 30:
  this.$ = { code: "vector", vector: s.as_ref($$[$0-1]), start: $$[$0-2].start, end: $$[$0].end }; 
 break;
-case 28:
+case 31:
  this.$ = { code: "union", union: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end }; 
 break;
-case 29:
+case 32:
  this.$ = {}; 
 break;
-case 30:
+case 33:
  this.$ = $$[$0].reduce((r, lc) => { 
                                                   r[lc.label] = s.as_ref(lc.code);
                                                   return r }
                                                 , {}); 
 break;
-case 31: case 47: case 85:
+case 34: case 50: case 88:
  this.$ = [$$[$0]]; 
 break;
-case 32: case 48: case 86:
+case 35: case 51: case 89:
  this.$ = [].concat($$[$0-2],$$[$0]); 
 break;
-case 33: case 34: case 35:
+case 36: case 37: case 38:
  this.$ = {label: $$[$0].value, code: $$[$0-1]}; 
 break;
-case 36: case 37: case 38:
+case 39: case 40: case 41:
  this.$ = {label: $$[$0-2].value, code: $$[$0]}; 
 break;
-case 39:
+case 42:
  this.$ = { type: "name", name: $$[$0].value, start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 40:
+case 43:
  this.$ = { type: "code", code: s.as_ref($$[$0]), start: $$[$0-1].start, end: $$[$0].end}; 
 break;
-case 41:
+case 44:
  this.$ = { open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 42:
+case 45:
  this.$ = { type: "union", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 43:
+case 46:
  this.$ = { type: "product", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 44:
+case 47:
  this.$ = { type: "vector", vector: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end }; 
 break;
-case 45:
+case 48:
  this.$ = { fields: {}}; 
 break;
-case 46:
+case 49:
  this.$ = $$[$0].reduce((r, lc) => {
                                                   if (lc.dots) {
                                                     r.open = true;
@@ -214,79 +218,79 @@ case 46:
                                                   return r }
                                                 , { fields: {} }); 
 break;
-case 49:
+case 52:
  this.$ = {dots: true }; 
 break;
-case 50: case 51: case 52:
+case 53: case 54: case 55:
  this.$ = {label: $$[$0].value, filter: $$[$0-1]}; 
 break;
-case 53: case 54: case 55:
+case 56: case 57: case 58:
  this.$ = {label: $$[$0-2].value, filter: $$[$0]}; 
 break;
-case 57:
- this.$ = {...s.comp($$[$0-1], $$[$0]), start: $$[$0-1].start, end:$$[$0].end}; 
+case 60:
+ this.$ = {...comp($$[$0-1], $$[$0]), start: $$[$0-1].start, end:$$[$0].end}; 
 break;
-case 58:
+case 61:
  this.$ = {op: 'caret', caret: $$[$0-1], start: $$[$0-1].start, end:$$[$0].end}; 
 break;
-case 59:
+case 62:
  this.$ = {...$$[$0-1], start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 60:
+case 63:
  this.$ = {op: "vector", vector: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 61:
- this.$ = {...s.union($$[$0-1]), start: $$[$0-2].start, end: $$[$0].end}; 
+case 64:
+ this.$ = {...union($$[$0-1]), start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 62:
+case 65:
  this.$ = {op: "ref", ref: $$[$0].value, start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 63:
- this.$ = {...s.identity, start: $$[$0-1].start, end: $$[$0].end};  
+case 66:
+ this.$ = {...identity, start: $$[$0-1].start, end: $$[$0].end};  
 break;
-case 64:
+case 67:
  this.$ = {...$$[$0-1], start: $$[$0-2].start, end: $$[$0].end };  
 break;
-case 65:
+case 68:
  this.$ = {op: "str", str: $$[$0].value, start: $$[$0].start, end: $$[$0].end }; 
 break;
-case 66:
+case 69:
  this.$ = {op: "int", int: $$[$0].value, start: $$[$0].start, end: $$[$0].end }; 
 break;
-case 67: case 68: case 69:
+case 70: case 71: case 72:
  this.$ = {op: "dot", dot: $$[$0].value, start: $$[$0-1].start, end: $$[$0].end }; 
 break;
-case 70:
+case 73:
  this.$ = {op: "code", code: s.as_ref($$[$0]), start: $$[$0-1].start, end: $$[$0].end}; 
 break;
-case 71:
+case 74:
  this.$ = {op: "filter", filter: $$[$0], start: $$[$0-1].start, end:$$[$0].end}; 
 break;
-case 72:
+case 75:
  this.$ = {op: "pipe", start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 73:
+case 76:
  this.$ = {op: "product", product: []}; 
 break;
-case 75:
+case 78:
  this.$ = {op: "product", product: [$$[$0]]}; 
 break;
-case 76:
+case 79:
  $$[$0-2].product = [].concat($$[$0-2].product,$$[$0]); this.$ = $$[$0-2]; 
 break;
-case 77: case 78: case 79:
+case 80: case 81: case 82:
  this.$ = {label: $$[$0].value, exp: $$[$0-1]}; 
 break;
-case 80: case 81: case 82:
+case 83: case 84: case 85:
  this.$ = {label: $$[$0-2].value, exp: $$[$0]}; 
 break;
-case 83:
+case 86:
  this.$ = []; 
 break;
 }
 },
-table: [o($V0,[2,21],{41:1,42:2}),{1:[3]},{3:4,4:$V1,5:13,6:$V2,7:14,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,29:15,30:$V8,37:5,38:$V9,39:16,40:$Va,43:3,54:6,58:$Vb},{3:29,4:$V1,5:13,6:$V2,7:14,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,29:15,30:$V8,37:30,38:$V9,39:16,40:$Va,44:[1,26],54:27,55:$Vc,58:$Vb},o($Vd,$Ve,{25:31,26:$Vf}),{3:33,4:$V1,9:38,10:$V4,11:36,12:$V5,13:37,14:$V6,45:35,46:34},o($Vg,[2,56]),o([4,6,8,10,12,14,16,18,20,22,24,26,30,32,34,36,38,40,44,55,58],[2,1]),o([4,10,12,14],[2,18]),{3:43,4:$V1,5:44,6:$V2,7:45,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,20:[2,73],29:15,30:$V8,37:30,38:$V9,39:16,40:$Va,43:42,54:6,56:39,58:$Vb,59:40,60:41},{3:29,4:$V1,5:13,6:$V2,7:14,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,22:$Vh,29:15,30:$V8,37:30,38:$V9,39:16,40:$Va,43:48,54:6,57:46,58:$Vb,61:47},{3:29,4:$V1,5:13,6:$V2,7:14,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,18:$Vh,29:15,30:$V8,37:30,38:$V9,39:16,40:$Va,43:48,54:6,57:49,58:$Vb,61:47},{3:29,4:$V1,5:13,6:$V2,7:14,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,23:50,24:$Vi,29:15,30:$V8,37:30,38:$V9,39:16,40:$Va,43:51,54:6,58:$Vb},o($Vg,$Vj),o($Vg,$Vk),{3:55,4:$V1,5:54,6:$V2,7:53,8:$V3},{3:57,4:$V1,9:60,10:$V4,11:61,12:$V5,13:62,14:$V6,15:59,16:$V7,37:58,38:$V9,50:56},o($Vg,[2,72]),o([4,6,8,10,12,14,16,20,28,30,38,40,58],[2,5]),o([4,6,8,10,12,14,16,22,30,38,40,58],[2,6]),o([4,6,8,10,12,14,16,18,28,30,38,40,58],[2,4]),o([4,6,8,10,12,14,16,24,28,30,38,40,58],[2,7]),o($Vl,[2,2]),o($Vl,[2,3]),o($Vm,[2,14]),o([4,10,12,14,16,38],[2,19]),{1:[2,20]},o($Vg,[2,57]),o($Vg,[2,58]),o($Vg,$Ve),{3:63,4:$V1,9:38,10:$V4,11:36,12:$V5,13:37,14:$V6,45:35,46:34},{3:29,4:$V1,5:13,6:$V2,7:14,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,29:15,30:$V8,37:30,38:$V9,39:16,40:$Va,43:64,54:6,58:$Vb},o($V0,[2,12]),o($Vd,$Vn,{25:65,26:$Vf}),o($Vg,[2,70]),o($Vg,[2,25]),{3:70,4:$V1,5:71,6:$V2,7:72,8:$V3,9:38,10:$V4,11:36,12:$V5,13:37,14:$V6,20:$Vo,45:35,46:69,47:66,48:67,49:68},{3:63,4:$V1,9:38,10:$V4,11:36,12:$V5,13:37,14:$V6,45:35,46:73},{3:70,4:$V1,5:71,6:$V2,7:72,8:$V3,9:38,10:$V4,11:36,12:$V5,13:37,14:$V6,18:$Vo,45:35,46:69,47:74,48:67,49:68},{19:75,20:$Vp},{20:[2,74],31:77,32:$Vq},o($Vr,[2,75]),{3:79,4:$V1,5:80,6:$V2,7:81,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,29:15,30:$V8,37:30,38:$V9,39:16,40:$Va,54:27,55:$Vc,58:$Vb},o($Vs,$Ve,{35:82,36:$Vt}),o($Vs,$Vj,{35:84,36:$Vt}),o($Vs,$Vk,{35:85,36:$Vt}),{21:86,22:$Vu},o([18,22],[2,84],{31:88,32:$Vq}),o($Vv,[2,85],{11:9,13:10,9:11,15:12,5:13,7:14,29:15,39:16,54:27,3:29,37:30,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,55:$Vc,58:$Vb}),{17:89,18:$Vw},o($Vg,[2,63]),{3:29,4:$V1,5:13,6:$V2,7:14,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,23:91,24:$Vi,29:15,30:$V8,37:30,38:$V9,39:16,40:$Va,54:27,55:$Vc,58:$Vb},o($Vg,[2,11]),o($Vg,[2,67]),o($Vg,[2,68]),o($Vg,[2,69]),o($Vg,[2,71]),o($Vg,$Vx),{3:63,4:$V1,9:38,10:$V4,11:36,12:$V5,13:37,14:$V6,45:35,46:92},{3:98,4:$V1,5:99,6:$V2,7:100,8:$V3,9:60,10:$V4,11:61,12:$V5,13:62,14:$V6,15:59,16:$V7,24:$Vy,27:96,28:$Vz,37:58,38:$V9,50:97,51:93,52:94,53:95},{3:98,4:$V1,5:99,6:$V2,7:100,8:$V3,9:60,10:$V4,11:61,12:$V5,13:62,14:$V6,15:59,16:$V7,18:$Vy,27:96,28:$Vz,37:58,38:$V9,50:97,51:102,52:94,53:95},{3:98,4:$V1,5:99,6:$V2,7:100,8:$V3,9:60,10:$V4,11:61,12:$V5,13:62,14:$V6,15:59,16:$V7,20:$Vy,27:96,28:$Vz,37:58,38:$V9,50:97,51:103,52:94,53:95},{3:57,4:$V1,9:60,10:$V4,11:61,12:$V5,13:62,14:$V6,15:59,16:$V7,37:58,38:$V9,50:104},o($Vg,$Vn),{3:29,4:$V1,5:13,6:$V2,7:14,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,29:15,30:$V8,33:105,34:[1,106],37:30,38:$V9,39:16,40:$Va,54:27,55:$Vc,58:$Vb},{9:38,10:$V4,11:36,12:$V5,13:37,14:$V6,45:107},{19:108,20:$Vp},o([18,20],[2,30],{31:109,32:$Vq}),o($VA,[2,31]),{3:110,4:$V1,5:111,6:$V2,7:112,8:$V3},o($Vm,$Vn,{35:113,36:$Vt}),{35:114,36:$Vt},{35:115,36:$Vt},{21:116,22:$Vu},{17:117,18:$Vw},o($Vg,[2,59]),o($Vg,[2,9]),{3:43,4:$V1,5:44,6:$V2,7:45,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,29:15,30:$V8,37:30,38:$V9,39:16,40:$Va,43:42,54:6,58:$Vb,60:118},o([4,6,8,10,12,14,16,28,30,38,40,58],[2,15]),o($Vs,$Ve,{20:$VB,32:$VB}),o($Vs,$Vj,{20:$VC,32:$VC}),o($Vs,$Vk,{20:$VD,32:$VD}),{3:29,4:$V1,5:13,6:$V2,7:14,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,29:15,30:$V8,37:30,38:$V9,39:16,40:$Va,43:119,54:6,58:$Vb},o($V0,[2,17]),{3:29,4:$V1,5:13,6:$V2,7:14,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,29:15,30:$V8,37:30,38:$V9,39:16,40:$Va,43:120,54:6,58:$Vb},{3:29,4:$V1,5:13,6:$V2,7:14,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,29:15,30:$V8,37:30,38:$V9,39:16,40:$Va,43:121,54:6,58:$Vb},o($Vg,[2,60]),o($Vg,[2,10]),{3:29,4:$V1,5:13,6:$V2,7:14,8:$V3,9:11,10:$V4,11:9,12:$V5,13:10,14:$V6,15:12,16:$V7,29:15,30:$V8,37:30,38:$V9,39:16,40:$Va,43:122,54:6,58:$Vb},o($Vg,[2,61]),o($Vg,[2,8]),o($Vg,[2,64]),o($Vg,[2,40]),{23:123,24:$Vi},o([18,20,24],[2,46],{31:124,32:$Vq}),o($VE,[2,47]),o($VE,[2,49]),{3:125,4:$V1,5:126,6:$V2,7:127,8:$V3},o($Vm,$Vx,{35:128,36:$Vt}),{35:129,36:$Vt},{35:130,36:$Vt},o($VE,[2,13]),{17:131,18:$Vw},{19:132,20:$Vp},{21:133,22:$Vu},o($V0,[2,22]),o($V0,[2,16]),{34:[1,134]},o($Vg,[2,26]),{3:70,4:$V1,5:71,6:$V2,7:72,8:$V3,9:38,10:$V4,11:36,12:$V5,13:37,14:$V6,45:35,46:69,49:135},o($VA,[2,33]),o($VA,[2,34]),o($VA,[2,35]),{3:63,4:$V1,9:38,10:$V4,11:36,12:$V5,13:37,14:$V6,45:35,46:136},{3:63,4:$V1,9:38,10:$V4,11:36,12:$V5,13:37,14:$V6,45:35,46:137},{3:63,4:$V1,9:38,10:$V4,11:36,12:$V5,13:37,14:$V6,45:35,46:138},o($Vg,[2,27]),o($Vg,[2,28]),o($Vr,[2,76]),o($Vr,[2,80],{11:9,13:10,9:11,15:12,5:13,7:14,29:15,39:16,54:27,3:29,37:30,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,55:$Vc,58:$Vb}),o($Vr,[2,81],{11:9,13:10,9:11,15:12,5:13,7:14,29:15,39:16,54:27,3:29,37:30,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,55:$Vc,58:$Vb}),o($Vr,[2,82],{11:9,13:10,9:11,15:12,5:13,7:14,29:15,39:16,54:27,3:29,37:30,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,55:$Vc,58:$Vb}),o($Vv,[2,86],{11:9,13:10,9:11,15:12,5:13,7:14,29:15,39:16,54:27,3:29,37:30,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,55:$Vc,58:$Vb}),o($Vg,[2,41]),{3:98,4:$V1,5:99,6:$V2,7:100,8:$V3,9:60,10:$V4,11:61,12:$V5,13:62,14:$V6,15:59,16:$V7,27:96,28:$Vz,37:58,38:$V9,50:97,53:139},o($VE,[2,50]),o($VE,[2,51]),o($VE,[2,52]),{3:57,4:$V1,9:60,10:$V4,11:61,12:$V5,13:62,14:$V6,15:59,16:$V7,37:58,38:$V9,50:140},{3:57,4:$V1,9:60,10:$V4,11:61,12:$V5,13:62,14:$V6,15:59,16:$V7,37:58,38:$V9,50:141},{3:57,4:$V1,9:60,10:$V4,11:61,12:$V5,13:62,14:$V6,15:59,16:$V7,37:58,38:$V9,50:142},o($Vg,[2,42]),o($Vg,[2,43]),o($Vg,[2,44]),o($V0,[2,23]),o($VA,[2,32]),o($VA,[2,36]),o($VA,[2,37]),o($VA,[2,38]),o($VE,[2,48]),o($VE,[2,53]),o($VE,[2,54]),o($VE,[2,55])],
-defaultActions: {26:[2,20]},
+table: [o($V0,[2,22],{43:1,44:2,41:3,42:[1,4]}),{1:[3]},o($V0,[2,24],{45:5}),o($V0,[2,23]),o($V0,[2,20]),{3:7,4:$V1,5:16,6:$V2,7:17,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,29:18,30:$V8,37:8,38:$V9,39:19,40:$Va,46:6,57:9,61:$Vb},{3:32,4:$V1,5:16,6:$V2,7:17,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,47:[1,29],57:30,58:$Vc,61:$Vb},o($Vd,$Ve,{25:34,26:$Vf}),{3:36,4:$V1,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:38,49:37},o($Vg,[2,59]),o([4,6,8,10,12,14,16,18,20,22,24,26,30,32,34,36,38,40,47,58,61],[2,1]),o([4,10,12,14],[2,18]),{3:46,4:$V1,5:47,6:$V2,7:48,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,20:[2,76],29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:45,57:9,59:42,61:$Vb,62:43,63:44},{3:32,4:$V1,5:16,6:$V2,7:17,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,22:$Vh,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:51,57:9,60:49,61:$Vb,64:50},{3:32,4:$V1,5:16,6:$V2,7:17,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,18:$Vh,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:51,57:9,60:52,61:$Vb,64:50},{3:32,4:$V1,5:16,6:$V2,7:17,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,23:53,24:$Vi,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:54,57:9,61:$Vb},o($Vg,$Vj),o($Vg,$Vk),{3:58,4:$V1,5:57,6:$V2,7:56,8:$V3},{3:60,4:$V1,9:63,10:$V4,11:64,12:$V5,13:65,14:$V6,15:62,16:$V7,37:61,38:$V9,53:59},o($Vg,[2,75]),o([4,6,8,10,12,14,16,20,28,30,38,40,61],[2,5]),o([4,6,8,10,12,14,16,22,30,38,40,61],[2,6]),o([4,6,8,10,12,14,16,18,28,30,38,40,61],[2,4]),o([4,6,8,10,12,14,16,24,28,30,38,40,61],[2,7]),o($Vl,[2,2]),o($Vl,[2,3]),o($Vm,[2,14]),o([4,10,12,14,16,38],[2,19]),{1:[2,21]},o($Vg,[2,60]),o($Vg,[2,61]),o($Vg,$Ve),{3:66,4:$V1,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:38,49:37},{3:32,4:$V1,5:16,6:$V2,7:17,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:67,57:9,61:$Vb},o($V0,[2,12]),o($Vd,$Vn,{25:68,26:$Vf}),o($Vg,[2,73]),o($Vg,[2,28]),{3:73,4:$V1,5:74,6:$V2,7:75,8:$V3,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,20:$Vo,48:38,49:72,50:69,51:70,52:71},{3:66,4:$V1,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:38,49:76},{3:73,4:$V1,5:74,6:$V2,7:75,8:$V3,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,18:$Vo,48:38,49:72,50:77,51:70,52:71},{19:78,20:$Vp},{20:[2,77],31:80,32:$Vq},o($Vr,[2,78]),{3:82,4:$V1,5:83,6:$V2,7:84,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,57:30,58:$Vc,61:$Vb},o($Vs,$Ve,{35:85,36:$Vt}),o($Vs,$Vj,{35:87,36:$Vt}),o($Vs,$Vk,{35:88,36:$Vt}),{21:89,22:$Vu},o([18,22],[2,87],{31:91,32:$Vq}),o($Vv,[2,88],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,57:30,3:32,37:33,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,58:$Vc,61:$Vb}),{17:92,18:$Vw},o($Vg,[2,66]),{3:32,4:$V1,5:16,6:$V2,7:17,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,23:94,24:$Vi,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,57:30,58:$Vc,61:$Vb},o($Vg,[2,11]),o($Vg,[2,70]),o($Vg,[2,71]),o($Vg,[2,72]),o($Vg,[2,74]),o($Vg,$Vx),{3:66,4:$V1,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:38,49:95},{3:101,4:$V1,5:102,6:$V2,7:103,8:$V3,9:63,10:$V4,11:64,12:$V5,13:65,14:$V6,15:62,16:$V7,24:$Vy,27:99,28:$Vz,37:61,38:$V9,53:100,54:96,55:97,56:98},{3:101,4:$V1,5:102,6:$V2,7:103,8:$V3,9:63,10:$V4,11:64,12:$V5,13:65,14:$V6,15:62,16:$V7,18:$Vy,27:99,28:$Vz,37:61,38:$V9,53:100,54:105,55:97,56:98},{3:101,4:$V1,5:102,6:$V2,7:103,8:$V3,9:63,10:$V4,11:64,12:$V5,13:65,14:$V6,15:62,16:$V7,20:$Vy,27:99,28:$Vz,37:61,38:$V9,53:100,54:106,55:97,56:98},{3:60,4:$V1,9:63,10:$V4,11:64,12:$V5,13:65,14:$V6,15:62,16:$V7,37:61,38:$V9,53:107},o($Vg,$Vn),{3:32,4:$V1,5:16,6:$V2,7:17,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,29:18,30:$V8,33:108,34:[1,109],37:33,38:$V9,39:19,40:$Va,57:30,58:$Vc,61:$Vb},{9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:110},{19:111,20:$Vp},o([18,20],[2,33],{31:112,32:$Vq}),o($VA,[2,34]),{3:113,4:$V1,5:114,6:$V2,7:115,8:$V3},o($Vm,$Vn,{35:116,36:$Vt}),{35:117,36:$Vt},{35:118,36:$Vt},{21:119,22:$Vu},{17:120,18:$Vw},o($Vg,[2,62]),o($Vg,[2,9]),{3:46,4:$V1,5:47,6:$V2,7:48,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:45,57:9,61:$Vb,63:121},o([4,6,8,10,12,14,16,28,30,38,40,61],[2,15]),o($Vs,$Ve,{20:$VB,32:$VB}),o($Vs,$Vj,{20:$VC,32:$VC}),o($Vs,$Vk,{20:$VD,32:$VD}),{3:32,4:$V1,5:16,6:$V2,7:17,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:122,57:9,61:$Vb},o($V0,[2,17]),{3:32,4:$V1,5:16,6:$V2,7:17,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:123,57:9,61:$Vb},{3:32,4:$V1,5:16,6:$V2,7:17,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:124,57:9,61:$Vb},o($Vg,[2,63]),o($Vg,[2,10]),{3:32,4:$V1,5:16,6:$V2,7:17,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:125,57:9,61:$Vb},o($Vg,[2,64]),o($Vg,[2,8]),o($Vg,[2,67]),o($Vg,[2,43]),{23:126,24:$Vi},o([18,20,24],[2,49],{31:127,32:$Vq}),o($VE,[2,50]),o($VE,[2,52]),{3:128,4:$V1,5:129,6:$V2,7:130,8:$V3},o($Vm,$Vx,{35:131,36:$Vt}),{35:132,36:$Vt},{35:133,36:$Vt},o($VE,[2,13]),{17:134,18:$Vw},{19:135,20:$Vp},{21:136,22:$Vu},o($V0,[2,25]),o($V0,[2,16]),{34:[1,137]},o($Vg,[2,29]),{3:73,4:$V1,5:74,6:$V2,7:75,8:$V3,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:38,49:72,52:138},o($VA,[2,36]),o($VA,[2,37]),o($VA,[2,38]),{3:66,4:$V1,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:38,49:139},{3:66,4:$V1,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:38,49:140},{3:66,4:$V1,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:38,49:141},o($Vg,[2,30]),o($Vg,[2,31]),o($Vr,[2,79]),o($Vr,[2,83],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,57:30,3:32,37:33,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,58:$Vc,61:$Vb}),o($Vr,[2,84],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,57:30,3:32,37:33,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,58:$Vc,61:$Vb}),o($Vr,[2,85],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,57:30,3:32,37:33,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,58:$Vc,61:$Vb}),o($Vv,[2,89],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,57:30,3:32,37:33,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,58:$Vc,61:$Vb}),o($Vg,[2,44]),{3:101,4:$V1,5:102,6:$V2,7:103,8:$V3,9:63,10:$V4,11:64,12:$V5,13:65,14:$V6,15:62,16:$V7,27:99,28:$Vz,37:61,38:$V9,53:100,56:142},o($VE,[2,53]),o($VE,[2,54]),o($VE,[2,55]),{3:60,4:$V1,9:63,10:$V4,11:64,12:$V5,13:65,14:$V6,15:62,16:$V7,37:61,38:$V9,53:143},{3:60,4:$V1,9:63,10:$V4,11:64,12:$V5,13:65,14:$V6,15:62,16:$V7,37:61,38:$V9,53:144},{3:60,4:$V1,9:63,10:$V4,11:64,12:$V5,13:65,14:$V6,15:62,16:$V7,37:61,38:$V9,53:145},o($Vg,[2,45]),o($Vg,[2,46]),o($Vg,[2,47]),o($V0,[2,26]),o($VA,[2,35]),o($VA,[2,39]),o($VA,[2,40]),o($VA,[2,41]),o($VE,[2,51]),o($VE,[2,56]),o($VE,[2,57]),o($VE,[2,58])],
+defaultActions: {29:[2,21]},
 parseError: function parseError (str, hash) {
     if (hash.recoverable) {
         this.trace(str);
@@ -798,9 +802,9 @@ case 17:return 38;
 break;
 case 18:return 40;
 break;
-case 19:return 58;
+case 19:return 61;
 break;
-case 20:return 55;
+case 20:return 58;
 break;
 case 21:return 6;
 break;
@@ -808,12 +812,14 @@ case 22:return 4;
 break;
 case 23:return 8;
 break;
-case 24:return 44;
+case 24:return 42;
+break;
+case 25:return 47;
 break;
 }
 },
-rules: [/^(?:[/][*]([*][^/]|[^*])*[*][/])/,/^(?:(\/\/|#|%|--)[^\n]*)/,/^(?:\s+)/,/^(?:<)/,/^(?:\{)/,/^(?:\[)/,/^(?:\()/,/^(?:>)/,/^(?:\})/,/^(?:\])/,/^(?:\))/,/^(?:=)/,/^(?:\.\.\.)/,/^(?:\.)/,/^(?:,)/,/^(?:;)/,/^(?::)/,/^(?:\$)/,/^(?:\?)/,/^(?:\|)/,/^(?:\^)/,/^(?:"([^"\\]|\\(.|\n))*"|'([^'\\]|\\(.|\n))*')/,/^(?:[a-zA-Z_][a-zA-Z0-9_?!]*)/,/^(?:0|[-]?[1-9][0-9]*)/,/^(?:$)/],
-conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24],"inclusive":true}}
+rules: [/^(?:[/][*]([*][^/]|[^*])*[*][/])/,/^(?:(\/\/|#|%|--)[^\n]*)/,/^(?:\s+)/,/^(?:<)/,/^(?:\{)/,/^(?:\[)/,/^(?:\()/,/^(?:>)/,/^(?:\})/,/^(?:\])/,/^(?:\))/,/^(?:=)/,/^(?:\.\.\.)/,/^(?:\.)/,/^(?:,)/,/^(?:;)/,/^(?::)/,/^(?:\$)/,/^(?:\?)/,/^(?:\|)/,/^(?:\^)/,/^(?:"([^"\\]|\\(.|\n))*"|'([^'\\]|\\(.|\n))*')/,/^(?:[a-zA-Z_][a-zA-Z0-9_?!]*)/,/^(?:0|[-]?[1-9][0-9]*)/,/^(?:\+\+\+)/,/^(?:$)/],
+conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25],"inclusive":true}}
 });
 return lexer;
 })();