@fraczak/k 5.1.2 → 6.0.0

package/package.json

@@ -1,23 +1,33 @@
 {
     "name": "@fraczak/k",
-    "version": "5.1.2",
-    "description": "k-language for JSON-like data transformation",
+    "version": "6.0.0",
+    "description": "k — a language for composing first-order partial functions over algebraic data types (products and tagged unions); includes runtime, type derivation, REPL, and codec toolchain",
     "main": "index.mjs",
     "scripts": {
-        "prepare": "jiwson -m es6 parser.jison -o parser.mjs",
-        "test": "node test.mjs; for f in Code-derivation-tests/*.mjs; do echo $f; node $f; done; node test-fingerprint.mjs; ./tests.sh"
+        "prepare": "jiwson -m es6 parser.jison -o parser.mjs; jiwson -m es6 valueParser.jison -o valueParser.mjs; ",
+        "test": "node test.mjs; for f in Code-derivation-tests/*.mjs; do echo $f; node $f; done; node test-fingerprint.mjs; node test-hash-fuzz.mjs; node test-hash-normalization.mjs; node test-k-object.mjs; node test-repl2.mjs; ./tests.sh",
+        "deps:graph": "node scripts/generate-dependency-graph.mjs"
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/fraczak/k.git"
+        "url": "git+https://github.com/fraczak/k.git"
+    },
+    "publishConfig": {
+        "access": "public"
     },
     "author": "Wojciech Fraczak",
     "license": "ISC",
     "bin": {
-        "k": "./k.mjs",
-        "k-repl": "./repl.mjs"
+        "k": "k.mjs",
+        "k-compile-object": "objects/compile.mjs",
+        "k-decompile-object": "objects/decompile.mjs",
+        "k-parse": "codecs/k-parse.mjs",
+        "k-pattern": "codecs/k-pattern.mjs",
+        "k-print": "codecs/k-print.mjs",
+        "k-repl": "repl2.mjs",
+        "k-repl2": "repl2.mjs"
     },
     "devDependencies": {
-        "jiwson": "^0.1.1"
+        "jiwson": "^0.1.2"
     }
 }

package/parser.jison

@@ -37,63 +37,63 @@ function fromEscString(escString) {
   return str;
 }
 
+
 %}
 
 %lex
 
 %%
-[/][*]([^*]*[*]+[^*/])*[^*]*[*]+[/]             /* c-comment */
-("//"|"#"|"%"|"--"|"\\")[^\n]*                  /* one line comment */
-\s+                                             /* blanks */
+[/][*]([^*]*[*]+[^*/])*[^*]*[*]+[/]            /* c-comment */
+("//"|"#"|"%"|"--"|"\\\\")[^\n]*               /* one line comment */
+\s+                                            /* blanks */
 "<"                                            return 'LA';
 "{"                                            return 'LC';
-"["                                            return 'LB';
 "("                                            return 'LP';
 ">"                                            return 'RA';
 "}"                                            return 'RC';
-"]"                                            return 'RB';
 ")"                                            return 'RP';
 "="                                            return 'EQ'; 
 "..."                                          return 'DOTS';
 "."                                            return 'DOT';
+"/"                                            return 'DIV';
+("\\"|"|")                                     return 'VID';
 ","                                            return 'COMMA';
 ";"                                            return 'SC';
 ":"                                            return 'COL';
 "$"                                            return 'DOLLAR'; 
 "?"                                            return 'QMARK';
-"|"                                            return 'PIPE';
-"^"                                            return 'CARET';
 "@"                                            return 'AT';
 \"([^"\\]|\\(.|\n))*\"|\'([^'\\]|\\(.|\n))*\'  return 'STRING';
-[a-zA-Z_][a-zA-Z0-9_?!]*                       return 'NAME';
-0|[-]?[1-9][0-9]*                              return 'INT';
-"+++"                                          return 'INCREMENTAL';
+[a-zA-Z0-9_+-][a-zA-Z0-9_?!+-]*                return 'NAME';
+
+"~"                                            return 'INCREMENTAL';
 <<EOF>>                                        return 'EOF';
 
 /lex
 
-%token NAME STRING INT
-%token LA LC LB LP RA RP RB RC EQ DOT COMMA SC COL DOLLAR PIPE CARET AT QMARK DOTS
+%token NAME STRING
+%token LA LC LP RA RP RC EQ DOT COMMA SC COL DOLLAR AT QMARK DOTS DIV VID
+%token INCREMENTAL
 %token EOF
 
 %start input_with_eof
 
 %%
 
+str : STRING                            { $$ = getToken(yytext,yy,_$); $$.value = fromEscString($$.value);};
 name: NAME                              { $$ = getToken(yytext,yy,_$); };
-str: STRING                             { $$ = getToken(yytext,yy,_$); $$.value = fromEscString($$.value);};
-int: INT                                { $$ = getToken(yytext,yy,_$); $$.value = parseInt($$.value); };
+at: AT                                  { $$ = getToken(yytext,yy,_$); };
 la: LA                                  { $$ = getToken(yytext,yy,_$); };
 lc: LC                                  { $$ = getToken(yytext,yy,_$); };
-lb: LB                                  { $$ = getToken(yytext,yy,_$); };
 lp: LP                                  { $$ = getToken(yytext,yy,_$); };
 ra: RA                                  { $$ = getToken(yytext,yy,_$); };
 rc: RC                                  { $$ = getToken(yytext,yy,_$); };
-rb: RB                                  { $$ = getToken(yytext,yy,_$); };
 rp: RP                                  { $$ = getToken(yytext,yy,_$); };
 eq: EQ                                  { $$ = getToken(yytext,yy,_$); };
 dots: DOTS                              { $$ = getToken(yytext,yy,_$); };
 dot: DOT                                { $$ = getToken(yytext,yy,_$); };
+div: DIV                                { $$ = getToken(yytext,yy,_$); };
+vid: VID                                { $$ = getToken(yytext,yy,_$); };
 comma: COMMA                            { $$ = getToken(yytext,yy,_$); };
 sc: SC                                  { $$ = getToken(yytext,yy,_$); };
 col: COL                                { $$ = getToken(yytext,yy,_$); };
@@ -120,17 +120,13 @@ defs:                                   {  }
 
 code
     : name                              { $$ = { code: "ref", ref: $1.value, start: $1.start, end: $1.end}; }
-    | AT name                           { $$ = { code: "ref", ref: "@" + $2.value, start: $1.start, end: $2.end}; }
     | codeDef                           { $$ = $1; }
     ;
 
 codeDef
-    : lc labelled_codes rc              { if (Object.keys($2).length == 1)
-                                            $$ = { code: "union", union: $2, start: $1.start, end: $3.end };
-                                          else
-                                            $$ = { code: "product", product: $2, start: $1.start, end: $3.end }; }
-    | lb code rb                        { $$ = { code: "vector", vector: s.as_ref($2), start: $1.start, end: $3.end }; }
+    : lc labelled_codes rc              { $$ = { code: "product", product: $2, start: $1.start, end: $3.end }; }
     | la labelled_codes ra              { $$ = { code: "union", union: $2, start: $1.start, end: $3.end }; }
+    | at name                           { $$ = { code: "ref", ref: "@" + $2.value, start: $1.start, end: $2.end}; }
     ;
 
 labelled_codes 
@@ -152,24 +148,15 @@ non_empty_labelled_codes
 code_label 
     : code name                         { $$ = {label: $2.value, code: $1}; }
     | code str                          { $$ = {label: $2.value, code: $1}; }
-    | code int                          { $$ = {label: $2.value, code: $1}; }
     | name col code                     { $$ = {label: $1.value, code: $3}; }
     | str col code                      { $$ = {label: $1.value, code: $3}; }
-    | int col code                      { $$ = {label: $1.value, code: $3}; }
     ;
 
 filter_
     : dollar code                 { $$ = { type: "code", code: s.as_ref($2), start: $1.start, end: $2.end}; }
-    | lp labelled_filters      rp { if ( !$2.open && (Object.keys($2.fields).length == 1))
-                                      $$ = { type: "union", open: $2.open, fields: $2.fields, start: $1.start, end: $3.end};
-                                    else 
-                                      $$ = { type: null, open: $2.open, fields: $2.fields, start: $1.start, end: $3.end}; }
+    | lp dots                 rp  { $$ = { type: null, open: true, fields: {}, start: $1.start, end: $3.end}; }
     | la labelled_filters      ra { $$ = { type: "union", open: $2.open, fields: $2.fields, start: $1.start, end: $3.end}; }
-    | lc labelled_filters      rc { if ( !$2.open && (Object.keys($2.fields).length == 1))
-                                      $$ = { type: "union", open: $2.open, fields: $2.fields, start: $1.start, end: $3.end};
-                                    else 
-                                      $$ = { type: "product", open: $2.open, fields: $2.fields, start: $1.start, end: $3.end}; }
-    | lb filter rb                { $$ = { type: "vector", vector: $2, start: $1.start, end: $3.end }; }
+    | lc labelled_filters      rc { $$ = { type: "product", open: $2.open, fields: $2.fields, start: $1.start, end: $3.end}; }
     ;
 
 filter
@@ -201,34 +188,30 @@ filter_label
     : dots                              { $$ = {dots: true }; }
     | filter name                       { $$ = {label: $2.value, filter: $1}; }
     | filter str                        { $$ = {label: $2.value, filter: $1}; }
-    | filter int                        { $$ = {label: $2.value, filter: $1}; }
     | name col filter                   { $$ = {label: $1.value, filter: $3}; }
     | str col filter                    { $$ = {label: $1.value, filter: $3}; }
-    | int col filter                    { $$ = {label: $1.value, filter: $3}; }
     ;
 
 comp 
     : exp                               { $$ = $1; }
     | 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                        { $$ = {...union($2), start: $1.start, end: $3.end}; }
-    | name                              { $$ = {op: "ref", ref: $1.value, start: $1.start, end: $1.end}; }
-    | AT name                           { $$ = {op: "ref", ref: "@" + $2.value, start: $1.start, end: $2.end}; }
+    | at name                           { $$ = {op: "ref", ref: "@" + $2.value, 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 }; }
-    | dot int                           { $$ = {op: "dot", dot: $2.value, start: $1.start, end: $2.end }; }
-    | dot str                           { $$ = {op: "dot", dot: $2.value, start: $1.start, end: $2.end }; }
+    | name                              { $$ = {op: "ref", ref: $1.value, start: $1.start, end: $1.end}; }
     | dot name                          { $$ = {op: "dot", dot: $2.value, start: $1.start, end: $2.end }; }
+    | dot str                           { $$ = {op: "dot", dot: $2.value, start: $1.start, end: $2.end }; }
+    | div name                          { $$ = {op: "div", div: $2.value, start: $1.start, end: $2.end }; }
+    | div str                           { $$ = {op: "div", div: $2.value, start: $1.start, end: $2.end }; }
+    | vid name                          { $$ = {op: "vid", vid: $2.value, start: $1.start, end: $2.end }; }
+    | vid str                           { $$ = {op: "vid", vid: $2.value, start: $1.start, end: $2.end }; }
     | dollar code                       { $$ = {op: "code", code: s.as_ref($2), start: $1.start, end: $2.end}; }
     | qmark filter                      { $$ = {op: "filter", filter: $2, start: $1.start, end:$2.end}; }
-    | PIPE                              { $$ = {op: "pipe", start: $1.start, end: $1.end}; }
     ;
 
 labelled
@@ -251,10 +234,8 @@ non_empty_labelled
 comp_label
     : comp name  { $$ = {label: $2.value, exp: $1}; }
     | comp str   { $$ = {label: $2.value, exp: $1}; }
-    | comp int   { $$ = {label: $2.value, exp: $1}; }
     | name col comp { $$ = {label: $1.value, exp: $3}; }
     | str col comp { $$ = {label: $1.value, exp: $3}; }
-    | int col comp { $$ = {label: $1.value, exp: $3}; }
     ;
 
 list

package/parser.mjs

@@ -1,5 +1,5 @@
 
-/* parser generated by jison 0.1.1 */
+/* parser generated by jison 0.1.2 */
 /*
   Returns a Parser object of the following structure:
 
@@ -114,26 +114,24 @@ 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,50,63],$V1=[1,10],$V2=[1,26],$V3=[1,27],$V4=[1,24],$V5=[1,22],$V6=[1,23],$V7=[1,25],$V8=[1,28],$V9=[1,11],$Va=[1,29],$Vb=[1,15],$Vc=[1,21],$Vd=[1,32],$Ve=[4,6,8,10,12,14,16,30,38,40,47,50,60,63],$Vf=[2,68],$Vg=[1,36],$Vh=[1,39],$Vi=[4,6,8,10,12,14,16,18,20,22,24,30,32,34,38,40,47,50,60,63],$Vj=[2,90],$Vk=[1,58],$Vl=[2,72],$Vm=[2,73],$Vn=[4,6,8,10,12,14,16,18,20,22,24,30,32,34,36,38,40,47,50,60,63],$Vo=[4,6,8],$Vp=[2,27],$Vq=[4,6,8,10,12,14,16,18,20,22,24,26,30,32,34,38,40,47,50,60,63],$Vr=[2,33],$Vs=[1,84],$Vt=[1,86],$Vu=[20,32],$Vv=[4,6,8,10,12,14,16,30,38,40,50,60,63],$Vw=[1,91],$Vx=[1,95],$Vy=[18,22,32],$Vz=[1,98],$VA=[2,50],$VB=[2,51],$VC=[1,110],$VD=[18,20,32],$VE=[2,84],$VF=[2,85],$VG=[2,86],$VH=[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=[6,8,10,12,14,26,28,30,38,40],$V1=[1,10],$V2=[1,22],$V3=[1,21],$V4=[1,20],$V5=[1,23],$V6=[1,24],$V7=[1,25],$V8=[1,26],$V9=[1,11],$Va=[1,27],$Vb=[6,8,10,12,14,26,28,30,38,40,47],$Vc=[2,63],$Vd=[1,33],$Ve=[4,6,8,10,12,14,16,18,20,26,28,30,32,34,38,40,47],$Vf=[1,46],$Vg=[1,53],$Vh=[4,6],$Vi=[2,27],$Vj=[4,6,8,10,12,14,16,18,20,22,26,28,30,32,34,38,40,47],$Vk=[2,32],$Vl=[1,79],$Vm=[1,81],$Vn=[18,32],$Vo=[4,6,8,10,12,14,26,28,30,38,40],$Vp=[1,85],$Vq=[1,88],$Vr=[16,32],$Vs=[2,46],$Vt=[1,94],$Vu=[2,47],$Vv=[16,18],$Vw=[16,18,32],$Vx=[2,76];
 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,"incremental":41,"INCREMENTAL":42,"input_with_eof":43,"initialize_symbol_table":44,"defs":45,"comp":46,"EOF":47,"codeDef":48,"code":49,"AT":50,"labelled_codes":51,"non_empty_labelled_codes":52,"code_label":53,"filter_":54,"labelled_filters":55,"filter":56,"non_empty_labelled_filters":57,"filter_label":58,"exp":59,"CARET":60,"labelled":61,"list":62,"PIPE":63,"non_empty_labelled":64,"comp_label":65,"non_empty_list":66,"$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",50:"AT",60:"CARET",63:"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,2],[49,1],[48,3],[48,3],[48,3],[51,0],[51,1],[52,1],[52,3],[53,2],[53,2],[53,2],[53,3],[53,3],[53,3],[54,2],[54,3],[54,3],[54,3],[54,3],[56,1],[56,3],[56,1],[55,0],[55,1],[57,1],[57,3],[58,1],[58,2],[58,2],[58,2],[58,3],[58,3],[58,3],[46,1],[46,2],[46,2],[59,3],[59,3],[59,3],[59,1],[59,2],[59,2],[59,3],[59,1],[59,1],[59,2],[59,2],[59,2],[59,2],[59,2],[59,1],[61,0],[61,1],[64,1],[64,3],[65,2],[65,2],[65,2],[65,3],[65,3],[65,3],[62,0],[62,1],[66,1],[66,3]],
+symbols_: {"error":2,"str":3,"STRING":4,"name":5,"NAME":6,"at":7,"AT":8,"la":9,"LA":10,"lc":11,"LC":12,"lp":13,"LP":14,"ra":15,"RA":16,"rc":17,"RC":18,"rp":19,"RP":20,"eq":21,"EQ":22,"dots":23,"DOTS":24,"dot":25,"DOT":26,"div":27,"DIV":28,"vid":29,"VID":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,"filter":55,"non_empty_labelled_filters":56,"filter_label":57,"exp":58,"labelled":59,"list":60,"non_empty_labelled":61,"comp_label":62,"non_empty_list":63,"$accept":0,"$end":1},
+terminals_: {2:"error",4:"STRING",6:"NAME",8:"AT",10:"LA",12:"LC",14:"LP",16:"RA",18:"RC",20:"RP",22:"EQ",24:"DOTS",26:"DOT",28:"DIV",30:"VID",32:"COMMA",34:"SC",36:"COL",38:"DOLLAR",40:"QMARK",42:"INCREMENTAL",47:"EOF"},
+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,2],[50,0],[50,1],[51,1],[51,3],[52,2],[52,2],[52,3],[52,3],[53,2],[53,3],[53,3],[53,3],[55,1],[55,3],[55,1],[54,0],[54,1],[56,1],[56,3],[57,1],[57,2],[57,2],[57,3],[57,3],[46,1],[46,2],[58,3],[58,3],[58,2],[58,2],[58,3],[58,1],[58,2],[58,2],[58,2],[58,2],[58,2],[58,2],[58,2],[58,2],[59,0],[59,1],[61,1],[61,3],[62,2],[62,2],[62,3],[62,3],[60,0],[60,1],[63,1],[63,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 20:
- this.$ = getToken(yytext,yy,_$); 
-break;
-case 2:
+case 1:
  this.$ = getToken(yytext,yy,_$); this.$.value = fromEscString(this.$.value);
 break;
-case 3:
- this.$ = getToken(yytext,yy,_$); this.$.value = parseInt(this.$.value); 
+case 2: case 3: 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 21:
 
@@ -158,28 +156,22 @@ break;
 case 27:
  this.$ = { code: "ref", ref: $$[$0].value, start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 28:
- this.$ = { code: "ref", ref: "@" + $$[$0].value, start: $$[$0-1].start, end: $$[$0].end}; 
-break;
-case 29: case 48: case 62: case 91:
+case 28: case 44: case 56: case 81:
  this.$ = $$[$0]; 
 break;
+case 29:
+ this.$ = { code: "product", product: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end }; 
+break;
 case 30:
- if (Object.keys($$[$0-1]).length == 1)
-                                            this.$ = { code: "union", union: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end };
-                                          else
-                                            this.$ = { code: "product", product: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end }; 
+ this.$ = { code: "union", union: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end }; 
 break;
 case 31:
- this.$ = { code: "vector", vector: s.as_ref($$[$0-1]), start: $$[$0-2].start, end: $$[$0].end }; 
+ this.$ = { code: "ref", ref: "@" + $$[$0].value, start: $$[$0-1].start, end: $$[$0].end}; 
 break;
 case 32:
- this.$ = { code: "union", union: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end }; 
-break;
-case 33:
  this.$ = {}; 
 break;
-case 34:
+case 33:
  this.$ = $$[$0].reduce((r, lc) => { 
                                             if (r[lc.label])
                                                 anError(this._$,`Duplicate label '${lc.label}'.`);
@@ -187,49 +179,40 @@ case 34:
                                             return r }
                                         , {}); 
 break;
-case 35: case 53: case 92:
+case 34: case 49: case 82:
  this.$ = [$$[$0]]; 
 break;
-case 36: case 54: case 93:
+case 35: case 50: case 83:
  this.$ = [].concat($$[$0-2],$$[$0]); 
 break;
-case 37: case 38: case 39:
+case 36: case 37:
  this.$ = {label: $$[$0].value, code: $$[$0-1]}; 
 break;
-case 40: case 41: case 42:
+case 38: case 39:
  this.$ = {label: $$[$0-2].value, code: $$[$0]}; 
 break;
-case 43:
+case 40:
  this.$ = { type: "code", code: s.as_ref($$[$0]), start: $$[$0-1].start, end: $$[$0].end}; 
 break;
-case 44:
- if ( !$$[$0-1].open && (Object.keys($$[$0-1].fields).length == 1))
-                                      this.$ = { type: "union", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end};
-                                    else 
-                                      this.$ = { type: null, open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
+case 41:
+ this.$ = { type: null, open: true, fields: {}, start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 45:
+case 42:
  this.$ = { type: "union", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 46:
- if ( !$$[$0-1].open && (Object.keys($$[$0-1].fields).length == 1))
-                                      this.$ = { type: "union", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end};
-                                    else 
-                                      this.$ = { type: "product", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
-break;
-case 47:
- this.$ = { type: "vector", vector: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end }; 
+case 43:
+ this.$ = { type: "product", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 49:
+case 45:
  this.$ = { name: $$[$0].value, ...$$[$0-2], start: $$[$0-2].start, end: $$[$0].end }; 
 break;
-case 50:
+case 46:
  this.$ = { type: 'name', name: $$[$0].value, open: true, start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 51:
+case 47:
  this.$ = { fields: {}}; 
 break;
-case 52:
+case 48:
  this.$ = $$[$0].reduce((r, lc) => {
                                                   if (lc.dots) {
                                                     r.open = true;
@@ -241,64 +224,55 @@ case 52:
                                                   return r }
                                                 , { fields: {} }); 
 break;
-case 55:
+case 51:
  this.$ = {dots: true }; 
 break;
-case 56: case 57: case 58:
+case 52: case 53:
  this.$ = {label: $$[$0].value, filter: $$[$0-1]}; 
 break;
-case 59: case 60: case 61:
+case 54: case 55:
  this.$ = {label: $$[$0-2].value, filter: $$[$0]}; 
 break;
-case 63:
+case 57:
  this.$ = {...comp($$[$0-1], $$[$0]), start: $$[$0-1].start, end:$$[$0].end}; 
 break;
-case 64:
- this.$ = {op: 'caret', caret: $$[$0-1], start: $$[$0-1].start, end:$$[$0].end}; 
-break;
-case 65:
+case 58:
  this.$ = {...$$[$0-1], start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 66:
- this.$ = {op: "vector", vector: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end}; 
-break;
-case 67:
+case 59:
  this.$ = {...union($$[$0-1]), start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 68:
- this.$ = {op: "ref", ref: $$[$0].value, start: $$[$0].start, end: $$[$0].end}; 
-break;
-case 69:
+case 60:
  this.$ = {op: "ref", ref: "@" + $$[$0].value, start: $$[$0-1].start, end: $$[$0].end}; 
 break;
-case 70:
+case 61:
  this.$ = {...identity, start: $$[$0-1].start, end: $$[$0].end};  
 break;
-case 71:
+case 62:
  this.$ = {...$$[$0-1], start: $$[$0-2].start, end: $$[$0].end };  
 break;
-case 72:
- this.$ = {op: "str", str: $$[$0].value, start: $$[$0].start, end: $$[$0].end }; 
-break;
-case 73:
- this.$ = {op: "int", int: $$[$0].value, start: $$[$0].start, end: $$[$0].end }; 
+case 63:
+ this.$ = {op: "ref", ref: $$[$0].value, start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 74: case 75: case 76:
+case 64: case 65:
  this.$ = {op: "dot", dot: $$[$0].value, start: $$[$0-1].start, end: $$[$0].end }; 
 break;
-case 77:
+case 66: case 67:
+ this.$ = {op: "div", div: $$[$0].value, start: $$[$0-1].start, end: $$[$0].end }; 
+break;
+case 68: case 69:
+ this.$ = {op: "vid", vid: $$[$0].value, start: $$[$0-1].start, end: $$[$0].end }; 
+break;
+case 70:
  this.$ = {op: "code", code: s.as_ref($$[$0]), start: $$[$0-1].start, end: $$[$0].end}; 
 break;
-case 78:
+case 71:
  this.$ = {op: "filter", filter: $$[$0], start: $$[$0-1].start, end:$$[$0].end}; 
 break;
-case 79:
- this.$ = {op: "pipe", start: $$[$0].start, end: $$[$0].end}; 
-break;
-case 80:
+case 72:
  this.$ = {op: "product", product: []}; 
 break;
-case 81:
+case 73:
  $$[$0].product.reduce( (labels, {label}) =>
                                             { if (labels[label]) 
                                                 anError(this._$,`Duplicate label '${label}'.`)
@@ -306,25 +280,25 @@ case 81:
                                               return labels; }, {});
                                           this.$ = $$[$0]; 
 break;
-case 82:
+case 74:
  this.$ = {op: "product", product: [$$[$0]]}; 
 break;
-case 83:
+case 75:
  $$[$0-2].product = [].concat($$[$0-2].product,$$[$0]); this.$ = $$[$0-2]; 
 break;
-case 84: case 85: case 86:
+case 76: case 77:
  this.$ = {label: $$[$0].value, exp: $$[$0-1]}; 
 break;
-case 87: case 88: case 89:
+case 78: case 79:
  this.$ = {label: $$[$0-2].value, exp: $$[$0]}; 
 break;
-case 90:
+case 80:
  this.$ = []; 
 break;
 }
 },
-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:17,6:$V2,7:18,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,29:19,30:$V8,37:8,38:$V9,39:20,40:$Va,46:6,50:$Vb,59:9,63:$Vc},{3:33,4:$V1,5:17,6:$V2,7:18,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,29:19,30:$V8,37:34,38:$V9,39:20,40:$Va,47:[1,30],50:$Vb,59:31,60:$Vd,63:$Vc},o($Ve,$Vf,{25:35,26:$Vg}),{3:37,4:$V1,9:43,10:$V4,11:41,12:$V5,13:42,14:$V6,48:40,49:38,50:$Vh},o($Vi,[2,62]),o([4,6,8,10,12,14,16,18,20,22,24,26,30,32,34,36,38,40,47,50,60,63],[2,1]),o([4,10,12,14,50],[2,18]),{3:48,4:$V1,5:49,6:$V2,7:50,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,20:[2,80],29:19,30:$V8,37:34,38:$V9,39:20,40:$Va,46:47,50:$Vb,59:9,61:44,63:$Vc,64:45,65:46},{3:33,4:$V1,5:17,6:$V2,7:18,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,22:$Vj,29:19,30:$V8,37:34,38:$V9,39:20,40:$Va,46:53,50:$Vb,59:9,62:51,63:$Vc,66:52},{3:33,4:$V1,5:17,6:$V2,7:18,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,18:$Vj,29:19,30:$V8,37:34,38:$V9,39:20,40:$Va,46:53,50:$Vb,59:9,62:54,63:$Vc,66:52},{3:55,4:$V1},{3:33,4:$V1,5:17,6:$V2,7:18,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,23:56,24:$Vk,29:19,30:$V8,37:34,38:$V9,39:20,40:$Va,46:57,50:$Vb,59:9,63:$Vc},o($Vi,$Vl),o($Vi,$Vm),{3:61,4:$V1,5:60,6:$V2,7:59,8:$V3},{3:64,4:$V1,9:67,10:$V4,11:68,12:$V5,13:69,14:$V6,15:66,16:$V7,37:65,38:$V9,54:63,56:62},o($Vi,[2,79]),o([4,6,8,10,12,14,16,20,28,30,38,40,50,63],[2,5]),o([4,6,8,10,12,14,16,22,30,38,40,50,63],[2,6]),o([4,6,8,10,12,14,16,18,28,30,38,40,50,63],[2,4]),o([4,6,8,10,12,14,16,24,28,30,38,40,50,63],[2,7]),o($Vn,[2,2]),o($Vn,[2,3]),o($Vo,[2,14]),o([4,10,12,14,16,38],[2,19]),{1:[2,21]},o($Vi,[2,63]),o($Vi,[2,64]),o($Vi,$Vf),{3:70,4:$V1,9:43,10:$V4,11:41,12:$V5,13:42,14:$V6,48:40,49:38,50:$Vh},{3:33,4:$V1,5:17,6:$V2,7:18,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,29:19,30:$V8,37:34,38:$V9,39:20,40:$Va,46:71,50:$Vb,59:9,63:$Vc},o($V0,[2,12]),o($Ve,$Vp,{25:72,26:$Vg}),o($Vi,[2,77]),{3:73,4:$V1},o($Vq,[2,29]),{3:78,4:$V1,5:79,6:$V2,7:80,8:$V3,9:43,10:$V4,11:41,12:$V5,13:42,14:$V6,20:$Vr,48:40,49:77,50:$Vh,51:74,52:75,53:76},{3:70,4:$V1,9:43,10:$V4,11:41,12:$V5,13:42,14:$V6,48:40,49:81,50:$Vh},{3:78,4:$V1,5:79,6:$V2,7:80,8:$V3,9:43,10:$V4,11:41,12:$V5,13:42,14:$V6,18:$Vr,48:40,49:77,50:$Vh,51:82,52:75,53:76},{19:83,20:$Vs},{20:[2,81],31:85,32:$Vt},o($Vu,[2,82]),{3:87,4:$V1,5:88,6:$V2,7:89,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,29:19,30:$V8,37:34,38:$V9,39:20,40:$Va,50:$Vb,59:31,60:$Vd,63:$Vc},o($Vv,$Vf,{35:90,36:$Vw}),o($Vv,$Vl,{35:92,36:$Vw}),o($Vv,$Vm,{35:93,36:$Vw}),{21:94,22:$Vx},o([18,22],[2,91],{31:96,32:$Vt}),o($Vy,[2,92],{11:12,13:13,9:14,15:16,5:17,7:18,29:19,39:20,59:31,3:33,37:34,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,50:$Vb,60:$Vd,63:$Vc}),{17:97,18:$Vz},o($Vi,[2,69]),o($Vi,[2,70]),{3:33,4:$V1,5:17,6:$V2,7:18,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,23:99,24:$Vk,29:19,30:$V8,37:34,38:$V9,39:20,40:$Va,50:$Vb,59:31,60:$Vd,63:$Vc},o($Vq,[2,11]),o($Vi,[2,74]),o($Vi,[2,75]),o($Vi,[2,76]),o($Vi,[2,78]),o($Vi,[2,48],{26:[1,100]}),o($Vi,$VA),{3:70,4:$V1,9:43,10:$V4,11:41,12:$V5,13:42,14:$V6,48:40,49:101,50:$Vh},{3:107,4:$V1,5:108,6:$V2,7:109,8:$V3,9:67,10:$V4,11:68,12:$V5,13:69,14:$V6,15:66,16:$V7,24:$VB,27:105,28:$VC,37:65,38:$V9,54:63,55:102,56:106,57:103,58:104},{3:107,4:$V1,5:108,6:$V2,7:109,8:$V3,9:67,10:$V4,11:68,12:$V5,13:69,14:$V6,15:66,16:$V7,18:$VB,27:105,28:$VC,37:65,38:$V9,54:63,55:111,56:106,57:103,58:104},{3:107,4:$V1,5:108,6:$V2,7:109,8:$V3,9:67,10:$V4,11:68,12:$V5,13:69,14:$V6,15:66,16:$V7,20:$VB,27:105,28:$VC,37:65,38:$V9,54:63,55:112,56:106,57:103,58:104},{3:64,4:$V1,9:67,10:$V4,11:68,12:$V5,13:69,14:$V6,15:66,16:$V7,37:65,38:$V9,54:63,56:113},o($Vq,$Vp),{3:33,4:$V1,5:17,6:$V2,7:18,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,29:19,30:$V8,33:114,34:[1,115],37:34,38:$V9,39:20,40:$Va,50:$Vb,59:31,60:$Vd,63:$Vc},{9:43,10:$V4,11:41,12:$V5,13:42,14:$V6,48:116},o($Vq,[2,28]),{19:117,20:$Vs},o([18,20],[2,34],{31:118,32:$Vt}),o($VD,[2,35]),{3:119,4:$V1,5:120,6:$V2,7:121,8:$V3},o($Vo,$Vp,{35:122,36:$Vw}),{35:123,36:$Vw},{35:124,36:$Vw},{21:125,22:$Vx},{17:126,18:$Vz},o($Vi,[2,65]),o($Vq,[2,9]),{3:48,4:$V1,5:49,6:$V2,7:50,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,29:19,30:$V8,37:34,38:$V9,39:20,40:$Va,46:47,50:$Vb,59:9,63:$Vc,65:127},o([4,6,8,10,12,14,16,28,30,38,40,50,63],[2,15]),o($Vv,$Vf,{20:$VE,32:$VE}),o($Vv,$Vl,{20:$VF,32:$VF}),o($Vv,$Vm,{20:$VG,32:$VG}),{3:33,4:$V1,5:17,6:$V2,7:18,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,29:19,30:$V8,37:34,38:$V9,39:20,40:$Va,46:128,50:$Vb,59:9,63:$Vc},o($V0,[2,17]),{3:33,4:$V1,5:17,6:$V2,7:18,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,29:19,30:$V8,37:34,38:$V9,39:20,40:$Va,46:129,50:$Vb,59:9,63:$Vc},{3:33,4:$V1,5:17,6:$V2,7:18,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,29:19,30:$V8,37:34,38:$V9,39:20,40:$Va,46:130,50:$Vb,59:9,63:$Vc},o($Vi,[2,66]),o($Vq,[2,10]),{3:33,4:$V1,5:17,6:$V2,7:18,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:16,16:$V7,29:19,30:$V8,37:34,38:$V9,39:20,40:$Va,46:131,50:$Vb,59:9,63:$Vc},o($Vi,[2,67]),o($Vq,[2,8]),o($Vi,[2,71]),{3:132,4:$V1},o($Vq,[2,43]),{23:133,24:$Vk},o([18,20,24],[2,52],{31:134,32:$Vt}),o($VH,[2,53]),o($VH,[2,55]),{3:135,4:$V1,5:136,6:$V2,7:137,8:$V3},o($Vo,$VA,{35:138,36:$Vw}),{35:139,36:$Vw},{35:140,36:$Vw},o($VH,[2,13]),{17:141,18:$Vz},{19:142,20:$Vs},{21:143,22:$Vx},o($V0,[2,25]),o($V0,[2,16]),{34:[1,144]},o($Vq,[2,30]),{3:78,4:$V1,5:79,6:$V2,7:80,8:$V3,9:43,10:$V4,11:41,12:$V5,13:42,14:$V6,48:40,49:77,50:$Vh,53:145},o($VD,[2,37]),o($VD,[2,38]),o($VD,[2,39]),{3:70,4:$V1,9:43,10:$V4,11:41,12:$V5,13:42,14:$V6,48:40,49:146,50:$Vh},{3:70,4:$V1,9:43,10:$V4,11:41,12:$V5,13:42,14:$V6,48:40,49:147,50:$Vh},{3:70,4:$V1,9:43,10:$V4,11:41,12:$V5,13:42,14:$V6,48:40,49:148,50:$Vh},o($Vq,[2,31]),o($Vq,[2,32]),o($Vu,[2,83]),o($Vu,[2,87],{11:12,13:13,9:14,15:16,5:17,7:18,29:19,39:20,59:31,3:33,37:34,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,50:$Vb,60:$Vd,63:$Vc}),o($Vu,[2,88],{11:12,13:13,9:14,15:16,5:17,7:18,29:19,39:20,59:31,3:33,37:34,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,50:$Vb,60:$Vd,63:$Vc}),o($Vu,[2,89],{11:12,13:13,9:14,15:16,5:17,7:18,29:19,39:20,59:31,3:33,37:34,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,50:$Vb,60:$Vd,63:$Vc}),o($Vy,[2,93],{11:12,13:13,9:14,15:16,5:17,7:18,29:19,39:20,59:31,3:33,37:34,4:$V1,6:$V2,8:$V3,10:$V4,12:$V5,14:$V6,16:$V7,30:$V8,38:$V9,40:$Va,50:$Vb,60:$Vd,63:$Vc}),o($Vi,[2,49]),o($Vq,[2,44]),{3:107,4:$V1,5:108,6:$V2,7:109,8:$V3,9:67,10:$V4,11:68,12:$V5,13:69,14:$V6,15:66,16:$V7,27:105,28:$VC,37:65,38:$V9,54:63,56:106,58:149},o($VH,[2,56]),o($VH,[2,57]),o($VH,[2,58]),{3:64,4:$V1,9:67,10:$V4,11:68,12:$V5,13:69,14:$V6,15:66,16:$V7,37:65,38:$V9,54:63,56:150},{3:64,4:$V1,9:67,10:$V4,11:68,12:$V5,13:69,14:$V6,15:66,16:$V7,37:65,38:$V9,54:63,56:151},{3:64,4:$V1,9:67,10:$V4,11:68,12:$V5,13:69,14:$V6,15:66,16:$V7,37:65,38:$V9,54:63,56:152},o($Vq,[2,45]),o($Vq,[2,46]),o($Vq,[2,47]),o($V0,[2,26]),o($VD,[2,36]),o($VD,[2,40]),o($VD,[2,41]),o($VD,[2,42]),o($VH,[2,54]),o($VH,[2,59]),o($VH,[2,60]),o($VH,[2,61])],
-defaultActions: {30:[2,21]},
+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]),{5:7,6:$V1,7:14,8:$V2,9:13,10:$V3,11:12,12:$V4,13:15,14:$V5,25:16,26:$V6,27:17,28:$V7,29:18,30:$V8,37:8,38:$V9,39:19,40:$Va,46:6,58:9},{5:30,6:$V1,7:14,8:$V2,9:13,10:$V3,11:12,12:$V4,13:15,14:$V5,25:16,26:$V6,27:17,28:$V7,29:18,30:$V8,37:31,38:$V9,39:19,40:$Va,47:[1,28],58:29},o($Vb,$Vc,{21:32,22:$Vd}),{5:34,6:$V1,7:39,8:$V2,9:38,10:$V3,11:37,12:$V4,48:36,49:35},o($Ve,[2,56]),o([4,6,8,10,12,14,16,18,20,22,26,28,30,32,34,36,38,40,47],[2,2]),o([6,8,10,12],[2,18]),{3:45,4:$Vf,5:44,6:$V1,7:14,8:$V2,9:13,10:$V3,11:12,12:$V4,13:15,14:$V5,18:[2,72],25:16,26:$V6,27:17,28:$V7,29:18,30:$V8,37:31,38:$V9,39:19,40:$Va,46:43,58:9,59:40,61:41,62:42},{5:30,6:$V1,7:14,8:$V2,9:13,10:$V3,11:12,12:$V4,13:15,14:$V5,16:[2,80],25:16,26:$V6,27:17,28:$V7,29:18,30:$V8,37:31,38:$V9,39:19,40:$Va,46:49,58:9,60:47,63:48},{5:50,6:$V1},{5:30,6:$V1,7:14,8:$V2,9:13,10:$V3,11:12,12:$V4,13:15,14:$V5,19:51,20:$Vg,25:16,26:$V6,27:17,28:$V7,29:18,30:$V8,37:31,38:$V9,39:19,40:$Va,46:52,58:9},{3:55,4:$Vf,5:54,6:$V1},{3:57,4:$Vf,5:56,6:$V1},{3:59,4:$Vf,5:58,6:$V1},{5:62,6:$V1,9:65,10:$V3,11:66,12:$V4,13:64,14:$V5,37:63,38:$V9,53:61,55:60},o([4,6,8,10,12,14,18,24,26,28,30,38,40],[2,5]),o([4,6,8,10,12,14,16,24,26,28,30,38,40],[2,4]),{6:[2,3]},o([6,8,10,12,14,20,24,26,28,30,38,40],[2,6]),o($Vh,[2,12]),o($Vh,[2,13]),o($Vh,[2,14]),o([6,10,12,14,38],[2,19]),{1:[2,21]},o($Ve,[2,57]),o([6,8,10,12,14,16,18,20,26,28,30,32,34,38,40,47],$Vc),{5:67,6:$V1,7:39,8:$V2,9:38,10:$V3,11:37,12:$V4,48:36,49:35},{5:30,6:$V1,7:14,8:$V2,9:13,10:$V3,11:12,12:$V4,13:15,14:$V5,25:16,26:$V6,27:17,28:$V7,29:18,30:$V8,37:31,38:$V9,39:19,40:$Va,46:68,58:9},o($V0,[2,10]),o($Vb,$Vi,{21:69,22:$Vd}),o($Ve,[2,70]),o($Vj,[2,28]),{3:75,4:$Vf,5:74,6:$V1,7:39,8:$V2,9:38,10:$V3,11:37,12:$V4,18:$Vk,48:36,49:73,50:70,51:71,52:72},{3:75,4:$Vf,5:74,6:$V1,7:39,8:$V2,9:38,10:$V3,11:37,12:$V4,16:$Vk,48:36,49:73,50:76,51:71,52:72},{5:77,6:$V1},{17:78,18:$Vl},{18:[2,73],31:80,32:$Vm},o($Vn,[2,74]),{3:83,4:$Vf,5:82,6:$V1,7:14,8:$V2,9:13,10:$V3,11:12,12:$V4,13:15,14:$V5,25:16,26:$V6,27:17,28:$V7,29:18,30:$V8,37:31,38:$V9,39:19,40:$Va,58:29},o($Vo,$Vc,{35:84,36:$Vp}),{35:86,36:$Vp},o([4,6,8,10,12,14,16,18,20,26,28,30,32,34,36,38,40,47],[2,1]),{15:87,16:$Vq},{16:[2,81],31:89,32:$Vm},o($Vr,[2,82],{11:12,9:13,7:14,13:15,25:16,27:17,29:18,39:19,58:29,5:30,37:31,6:$V1,8:$V2,10:$V3,12:$V4,14:$V5,26:$V6,28:$V7,30:$V8,38:$V9,40:$Va}),o($Ve,[2,60]),o($Ve,[2,61]),{5:30,6:$V1,7:14,8:$V2,9:13,10:$V3,11:12,12:$V4,13:15,14:$V5,19:90,20:$Vg,25:16,26:$V6,27:17,28:$V7,29:18,30:$V8,37:31,38:$V9,39:19,40:$Va,58:29},o($Vj,[2,9]),o($Ve,[2,64]),o($Ve,[2,65]),o($Ve,[2,66]),o($Ve,[2,67]),o($Ve,[2,68]),o($Ve,[2,69]),o($Ve,[2,71]),o($Ve,[2,44],{22:[1,91]}),o($Ve,$Vs),{5:67,6:$V1,7:39,8:$V2,9:38,10:$V3,11:37,12:$V4,48:36,49:92},{23:93,24:$Vt},{3:101,4:$Vf,5:100,6:$V1,9:65,10:$V3,11:66,12:$V4,13:64,14:$V5,16:$Vu,23:98,24:$Vt,37:63,38:$V9,53:61,54:95,55:99,56:96,57:97},{3:101,4:$Vf,5:100,6:$V1,9:65,10:$V3,11:66,12:$V4,13:64,14:$V5,18:$Vu,23:98,24:$Vt,37:63,38:$V9,53:61,54:102,55:99,56:96,57:97},o($Vj,$Vi),{5:30,6:$V1,7:14,8:$V2,9:13,10:$V3,11:12,12:$V4,13:15,14:$V5,25:16,26:$V6,27:17,28:$V7,29:18,30:$V8,33:103,34:[1,104],37:31,38:$V9,39:19,40:$Va,58:29},{7:39,8:$V2,9:38,10:$V3,11:37,12:$V4,48:105},{17:106,18:$Vl},o($Vv,[2,33],{31:107,32:$Vm}),o($Vw,[2,34]),{3:109,4:$Vf,5:108,6:$V1},o($Vh,$Vi,{35:110,36:$Vp}),{35:111,36:$Vp},{15:112,16:$Vq},o($Vj,[2,31]),o($Ve,[2,58]),o($Vj,[2,8]),{3:45,4:$Vf,5:44,6:$V1,7:14,8:$V2,9:13,10:$V3,11:12,12:$V4,13:15,14:$V5,25:16,26:$V6,27:17,28:$V7,29:18,30:$V8,37:31,38:$V9,39:19,40:$Va,46:43,58:9,62:113},o([4,6,8,10,12,14,24,26,28,30,38,40],[2,15]),o($Vo,$Vc,{18:$Vx,32:$Vx}),o($Vn,[2,77]),{5:30,6:$V1,7:14,8:$V2,9:13,10:$V3,11:12,12:$V4,13:15,14:$V5,25:16,26:$V6,27:17,28:$V7,29:18,30:$V8,37:31,38:$V9,39:19,40:$Va,46:114,58:9},o($V0,[2,17]),{5:30,6:$V1,7:14,8:$V2,9:13,10:$V3,11:12,12:$V4,13:15,14:$V5,25:16,26:$V6,27:17,28:$V7,29:18,30:$V8,37:31,38:$V9,39:19,40:$Va,46:115,58:9},o($Ve,[2,59]),o($Vj,[2,7]),{5:30,6:$V1,7:14,8:$V2,9:13,10:$V3,11:12,12:$V4,13:15,14:$V5,25:16,26:$V6,27:17,28:$V7,29:18,30:$V8,37:31,38:$V9,39:19,40:$Va,46:116,58:9},o($Ve,[2,62]),{5:117,6:$V1},o($Vj,[2,40]),{19:118,20:$Vg},o([16,18,20,32],[2,11]),{15:119,16:$Vq},o($Vv,[2,48],{31:120,32:$Vm}),o($Vw,[2,49]),o($Vw,[2,51]),{3:122,4:$Vf,5:121,6:$V1},o($Vh,$Vs,{35:123,36:$Vp}),{35:124,36:$Vp},{17:125,18:$Vl},o($V0,[2,25]),o($V0,[2,16]),{34:[1,126]},o($Vj,[2,29]),{3:75,4:$Vf,5:74,6:$V1,7:39,8:$V2,9:38,10:$V3,11:37,12:$V4,48:36,49:73,52:127},o($Vw,[2,36]),o($Vw,[2,37]),{5:67,6:$V1,7:39,8:$V2,9:38,10:$V3,11:37,12:$V4,48:36,49:128},{5:67,6:$V1,7:39,8:$V2,9:38,10:$V3,11:37,12:$V4,48:36,49:129},o($Vj,[2,30]),o($Vn,[2,75]),o($Vn,[2,78],{11:12,9:13,7:14,13:15,25:16,27:17,29:18,39:19,58:29,5:30,37:31,6:$V1,8:$V2,10:$V3,12:$V4,14:$V5,26:$V6,28:$V7,30:$V8,38:$V9,40:$Va}),o($Vn,[2,79],{11:12,9:13,7:14,13:15,25:16,27:17,29:18,39:19,58:29,5:30,37:31,6:$V1,8:$V2,10:$V3,12:$V4,14:$V5,26:$V6,28:$V7,30:$V8,38:$V9,40:$Va}),o($Vr,[2,83],{11:12,9:13,7:14,13:15,25:16,27:17,29:18,39:19,58:29,5:30,37:31,6:$V1,8:$V2,10:$V3,12:$V4,14:$V5,26:$V6,28:$V7,30:$V8,38:$V9,40:$Va}),o($Ve,[2,45]),o($Vj,[2,41]),o($Vj,[2,42]),{3:101,4:$Vf,5:100,6:$V1,9:65,10:$V3,11:66,12:$V4,13:64,14:$V5,23:98,24:$Vt,37:63,38:$V9,53:61,55:99,57:130},o($Vw,[2,52]),o($Vw,[2,53]),{5:62,6:$V1,9:65,10:$V3,11:66,12:$V4,13:64,14:$V5,37:63,38:$V9,53:61,55:131},{5:62,6:$V1,9:65,10:$V3,11:66,12:$V4,13:64,14:$V5,37:63,38:$V9,53:61,55:132},o($Vj,[2,43]),o($V0,[2,26]),o($Vw,[2,35]),o($Vw,[2,38]),o($Vw,[2,39]),o($Vw,[2,50]),o($Vw,[2,54]),o($Vw,[2,55])],
+defaultActions: {22:[2,3],28:[2,21]},
 parseError: function parseError (str, hash) {
     if (hash.recoverable) {
         this.trace(str);
@@ -816,11 +790,11 @@ case 7:return 18;
 break;
 case 8:return 20;
 break;
-case 9:return 22;
+case 9:return 22; 
 break;
 case 10:return 24;
 break;
-case 11:return 26; 
+case 11:return 26;
 break;
 case 12:return 28;
 break;
@@ -836,26 +810,20 @@ case 17:return 38;
 break;
 case 18:return 40;
 break;
-case 19:return 63;
-break;
-case 20:return 60;
-break;
-case 21:return 50;
-break;
-case 22:return 6;
+case 19:return 8;
 break;
-case 23:return 4;
+case 20:return 4;
 break;
-case 24:return 8;
+case 21:return 6;
 break;
-case 25:return 42;
+case 22:return 42;
 break;
-case 26:return 47;
+case 23: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,25,26],"inclusive":true}}
+rules: [/^(?:[/][*]([^*]*[*]+[^*/])*[^*]*[*]+[/])/,/^(?:(\/\/|#|%|--|\\\\)[^\n]*)/,/^(?:\s+)/,/^(?:<)/,/^(?:\{)/,/^(?:\()/,/^(?:>)/,/^(?:\})/,/^(?:\))/,/^(?:=)/,/^(?:\.\.\.)/,/^(?:\.)/,/^(?:\/)/,/^(?:(\\|\|))/,/^(?:,)/,/^(?:;)/,/^(?::)/,/^(?:\$)/,/^(?:\?)/,/^(?:@)/,/^(?:"([^"\\]|\\(.|\n))*"|'([^'\\]|\\(.|\n))*')/,/^(?:[a-zA-Z0-9_+-][a-zA-Z0-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],"inclusive":true}}
 });
 return lexer;
 })();