@fraczak/k 5.0.1 → 5.1.0

package/README.md

@@ -54,7 +54,7 @@ the property doesn't exist. E.g.,
 
 There are three ways of combining functions:
 
-1. **composition**: `(f1 f2 ...)`, e.g. `(.toto .titi)` extracts
+1. **Composition**: `(f1 f2 ...)`, e.g. `(.toto .titi)` extracts
     nested field.
 
     ```text
@@ -64,7 +64,7 @@ There are three ways of combining functions:
             {"other": {}}            ... undefined
     ```
 
-2. **merge**: `< f1, f2,... >`, e.g., `<.toto, .titi>` extracts field
+2. **Merge**: `< f1, f2,... >`, e.g., `<.toto, .titi>` extracts field
     `toto` if present; otherwise extracts `titi`.
 
     ```text
@@ -74,7 +74,7 @@ There are three ways of combining functions:
             {"x":{"o":{}}, "z": {"o":{}}}  ... undefined
     ```
 
-3. **product**: `{ f1 label1, f2 label2, ...}`, e.g., `{.toto TOTO,
+3. **Product**: `{ f1 label1, f2 label2, ...}`, e.g., `{.toto TOTO,
     .titi TITI}` extracts two fields and builds a record out of them.
 
     ```text
@@ -86,9 +86,9 @@ There are three ways of combining functions:
 
 **QUIZ**: What is:
 
-- empty composition: `()` ?
-- empty merge: `<>` ?
-- empty product: `{}` ?
+- Empty composition: `()` ?
+- Empty merge: `<>` ?
+- Empty product: `{}` ?
 - `{{{{} s} s} s}` ?
 - `({{{() a} b} c} .c .b .a)` ?
 
@@ -96,9 +96,9 @@ There are three ways of combining functions:
 
 ### Syntactic sugar
 
-- parenthesis can be omitted, except for the empty composition `()`,
-- dot (`.`) in "projection" acts as a separator so the space around it
-  can be omitted.
+- Parenthesis can be omitted, except for the empty composition `()`,
+- dot (`.`) in "projection" acts as a separator, so the surrounding
+  space can be omitted.
 
 For example, `(.toto .titi (.0 .1))` can be written as `.toto.titi.0.1`.
 
@@ -148,8 +148,8 @@ projection, via (`.`), to the canonical string representation of the value, e.g.
 
 #### Vector product
 
-Vector product can be seen as an abbreviation for product whose all fields
-have the same type, and the filed names are integers starting from zero.  
+The vector product can be seen as a shorthand for a product in which all fields
+have the same type, and the field names are integers starting from zero.
 E.g., `{.toto 0, .titi 1, 123 2}` can be written as  
 `[.toto, .titi, 123]`.
 
@@ -531,7 +531,7 @@ For example:
 
 ## k-REPL (Read-Evaluate-Print Loop)
 
-Also there is a REPL, `k-repl` (`./node_modules/.bin/k-repl`),
+Also, there is a REPL, `k-repl` (`./node_modules/.bin/k-repl`),
 which acts like a toy shell for the language.
 
 ```k-repl
@@ -552,72 +552,74 @@ Very! experimental repl shell for 'k-language'...
 
 ## Using `k` from `javascript`
 
-     import k from "@fraczak/k";
+```javascript
+import k from "@fraczak/k";
 
-     let k_expression = '()';
-     k.run(k_expression,"ANYTHING...");
-     // RETURNS: "ANYTHING..."
+let k_expression = '()';
+k.run(k_expression,"ANYTHING...");
+// RETURNS: "ANYTHING..."
 
-     k_expression = '{"ala" name, 23 age}';
-     k.run(k_expression,"ANYTHING...");
-     // RETURNS: {"name":"ala","age":23}
+k_expression = '{"ala" name, 23 age}';
+k.run(k_expression,"ANYTHING...");
+// RETURNS: {"name":"ala","age":23}
 
-     k_expression = '[.year, .age]';
-     k.run(k_expression,{"year":2002,"age":19});
-     // RETURNS: [2002,19]
+k_expression = '[.year, .age]';
+k.run(k_expression,{"year":2002,"age":19});
+// RETURNS: [2002,19]
 
-     k_expression = '[(), ()]';
-     k.run(k_expression,"duplicate me");
-     // RETURNS: ["duplicate me","duplicate me"]
+k_expression = '[(), ()]';
+k.run(k_expression,"duplicate me");
+// RETURNS: ["duplicate me","duplicate me"]
 
-     k_expression = '[[[()]]]';
-     k.run(k_expression,"nesting");
-     // RETURNS: [[["nesting"]]]
+k_expression = '[[[()]]]';
+k.run(k_expression,"nesting");
+// RETURNS: [[["nesting"]]]
 
-     k_expression = '[[()]] {() nested, .0.0 val}';
-     k.run(k_expression,"nesting and accessing");
-     // RETURNS: {"nested":[["nesting and accessing"]],"val":"nesting and accessing"}
+k_expression = '[[()]] {() nested, .0.0 val}';
+k.run(k_expression,"nesting and accessing");
+// RETURNS: {"nested":[["nesting and accessing"]],"val":"nesting and accessing"}
 
-     k_expression = '0000';
-     k.run(k_expression,{"test":"parse integer"});
-     // RETURNS: 0
+k_expression = '0000';
+k.run(k_expression,{"test":"parse integer"});
+// RETURNS: 0
 
-     k_expression = '[.y,.x] PLUS';
-     k.run(k_expression,{"x":3,"y":4});
-     // RETURNS: 7
+k_expression = '[.y,.x] PLUS';
+k.run(k_expression,{"x":3,"y":4});
+// RETURNS: 7
 
-     var k_fn = k.compile('{.name nom, <[.age, 18] GT .0, [.age, 12] GT "ado", "enfant"> age}');
+var k_fn = k.compile('{.name nom, <[.age, 18] GT .0, [.age, 12] GT "ado", "enfant"> age}');
 
-     k_fn({"age":23,"name":"Emily"});
-     // RETURNS: {"nom":"Emily","age":23}
+k_fn({"age":23,"name":"Emily"});
+// RETURNS: {"nom":"Emily","age":23}
 
-     k_fn({"age":16,"name":"Katrina"});
-     // RETURNS: {"nom":"Katrina","age":"ado"}
+k_fn({"age":16,"name":"Katrina"});
+// RETURNS: {"nom":"Katrina","age":"ado"}
 
-     k_fn({"age":2,"name":"Mark"});
-     // RETURNS: {"nom":"Mark","age":"enfant"}
+k_fn({"age":2,"name":"Mark"});
+// RETURNS: {"nom":"Mark","age":"enfant"}
 
-     k_fn = k.compile('$t = < i: int, t: [ t ] > ; <$t, $int>');
+k_fn = k.compile('$t = < i: int, t: [ t ] > ; <$t, $int>');
 
-     k_fn(1);
-     // RETURNS: 1
+k_fn(1);
+// RETURNS: 1
 
-     k_fn({"i":1});
-     // RETURNS: {"i":1}
+k_fn({"i":1});
+// RETURNS: {"i":1}
 
-     k_fn([{"i":2},{"i":3},{"t":[]}]);
-     // RETURNS: undefined
+k_fn([{"i":2},{"i":3},{"t":[]}]);
+// RETURNS: undefined
 
-     k_fn({"t":[{"i":2},{"i":3},{"t":[]}]});
-     // RETURNS: {"t":[{"i":2},{"i":3},{"t":[]}]}
+k_fn({"t":[{"i":2},{"i":3},{"t":[]}]});
+// RETURNS: {"t":[{"i":2},{"i":3},{"t":[]}]}
 
-     k_fn = k.compile('$ < < [ int ] ints, [ bool ] bools > list, string None>');
+k_fn = k.compile('$ < < [ int ] ints, [ bool ] bools > list, string None>');
 
-     k_fn({"None":"None"});
-     // RETURNS: {"None":"None"}
+k_fn({"None":"None"});
+// RETURNS: {"None":"None"}
 
-     k_fn({"list":{"ints":[]}});
-     // RETURNS: {"list":{"ints":[]}}
+k_fn({"list":{"ints":[]}});
+// RETURNS: {"list":{"ints":[]}}
 
-     k_fn({"list":{"ints":[1,2,3]}});
-     // RETURNS: {"list":{"ints":[1,2,3]}}
+k_fn({"list":{"ints":[1,2,3]}});
+// RETURNS: {"list":{"ints":[1,2,3]}}
+```

package/TODO.md

@@ -1,7 +1,7 @@
 # To do list for canonical names
 
 - [ ] Write a script to search for conflicting names
-- [ ] Export a relation. i.e., rewrite it as a list of all
+- [*] Export a relation. i.e., rewrite it as a list of all
       dependency definitions using canonical names
 - [ ] Find a way of adding 'comments' or some way of 'tagging' the definitions
 - [X] The definitions should be simplied by removing useless filters
@@ -16,3 +16,38 @@ filters corresponding to the patterns. [DONE]
 
 The filer variables have to be renamed for normalization if they take part of 
 the canonical name calculation. [DONE]
+
+## DESER
+
+Serialization and deserialization of values.
+
+### Can we define byte-array via prefix-free codes?
+
+### Non prefix-free de/serialization
+
+How programatically change encoding of a value? Is it possible to add some
+annotations on the type graph? 
+
+Maybe it belongs to "execution environment", e.g., `k --deser JSON`, 
+`k --deser AVRO/UTF8`, where `JSON`, `AVRO`, `UTF8` are provided 
+by some external spec?
+
+E.g.:
+
+```DESER:
+ $ BsAqRMv = < BsAqRMv 0, BsAqRMv 1, KL _ >; -- $C0=<C0"0",C0"1",C1"_">;$C1={};
+
+  $ bnat = < {} _ @as '', bnat 0 @as '0' , bnat 1 >;
+  ::UTF8:: 
+      {{} _} => ()
+      {$bnat 0} => \u2602   
+
+Ok, it looks for me like what we need is the "Monad", i.e., a set of
+functions with side-effects (like `_log!`). 
+Get straight, we have `write_0!`, `write_1!`, `read_0!`, and `read_1!`, 
+or whatever is supported by the target.
+
+#### How to implement `JSON`?
+
+
+

package/codes.mjs

@@ -103,6 +103,7 @@ function minimize(codes) {
     for (const name1 in classes) {
       const [eq_names, dif_names] = classes[name1].reduce(
         ([eq_names, dif_names], name2) => {
+          // console.log(JSON.stringify({classes,codes,representatives,name1,name2},null,2));
           if (are_different(classes, representatives, name1, name2, codes)) {
             dif_names.push(name2);
           } else {
@@ -152,6 +153,9 @@ function normalizeAll(codes, representatives) {
             ...code,
             vector: representatives[code.vector] || code.vector,
           };
+          break;
+        default:
+          throw new Error(`Unexpected code ${code.code}`);
       }
     }
 
@@ -190,7 +194,7 @@ function finalize(codes) {
 }
 
 function register(newCodes) {
-  const { codes, representatives } = finalize( {...newCodes,...theRepository.codes});
+  const { codes, representatives } = finalize( {...theRepository.codes,...newCodes});
   const reps = Object.values(representatives).reduce((reps,rep) => 
     ({...reps, [rep]:rep})
   , {});

package/hash.mjs

@@ -33,7 +33,7 @@ function hash(inputString) {
         hashValue = (hashValue * prime + charCode) % mod;
     }
 
-    return shifString(hashValue.toString(base));
+    return "@"+shifString(hashValue.toString(base));
 }
 
 export default hash;

package/package.json

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

package/parser.jison

@@ -63,6 +63,7 @@ function fromEscString(escString) {
 "?"                                            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';
@@ -72,7 +73,7 @@ function fromEscString(escString) {
 /lex
 
 %token NAME STRING INT
-%token LA LC LB LP RA RP RB RC EQ DOT COMMA SC COL DOLLAR PIPE CARET QMARK DOTS
+%token LA LC LB LP RA RP RB RC EQ DOT COMMA SC COL DOLLAR PIPE CARET AT QMARK DOTS
 %token EOF
 
 %start input_with_eof
@@ -119,6 +120,7 @@ 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; }
     ;
 

package/parser.mjs

@@ -115,12 +115,12 @@ 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,62],$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,59,62],$Ve=[2,67],$Vf=[1,35],$Vg=[4,6,8,10,12,14,16,18,20,22,24,30,32,34,38,40,47,59,62],$Vh=[2,88],$Vi=[1,55],$Vj=[2,70],$Vk=[2,71],$Vl=[4,6,8,10,12,14,16,18,20,22,24,30,32,34,36,38,40,47,59,62],$Vm=[4,6,8],$Vn=[2,27],$Vo=[4,6,8,10,12,14,16,18,20,22,24,26,30,32,34,38,40,47,59,62],$Vp=[2,32],$Vq=[1,80],$Vr=[1,82],$Vs=[20,32],$Vt=[4,6,8,10,12,14,16,30,38,40,59,62],$Vu=[1,87],$Vv=[1,91],$Vw=[18,22,32],$Vx=[1,94],$Vy=[2,49],$Vz=[2,50],$VA=[1,106],$VB=[18,20,32],$VC=[2,82],$VD=[2,83],$VE=[2,84],$VF=[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,63],$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,60,63],$Ve=[2,68],$Vf=[1,35],$Vg=[1,38],$Vh=[4,6,8,10,12,14,16,18,20,22,24,30,32,34,38,40,47,60,63],$Vi=[2,89],$Vj=[1,56],$Vk=[2,71],$Vl=[2,72],$Vm=[4,6,8,10,12,14,16,18,20,22,24,30,32,34,36,38,40,47,60,63],$Vn=[4,6,8],$Vo=[2,27],$Vp=[4,6,8,10,12,14,16,18,20,22,24,26,30,32,34,38,40,47,60,63],$Vq=[2,33],$Vr=[1,82],$Vs=[1,84],$Vt=[20,32],$Vu=[4,6,8,10,12,14,16,30,38,40,60,63],$Vv=[1,89],$Vw=[1,93],$Vx=[18,22,32],$Vy=[1,96],$Vz=[2,50],$VA=[2,51],$VB=[1,108],$VC=[18,20,32],$VD=[2,83],$VE=[2,84],$VF=[2,85],$VG=[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,"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,"CARET":59,"labelled":60,"list":61,"PIPE":62,"non_empty_labelled":63,"comp_label":64,"non_empty_list":65,"$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",59:"CARET",62:"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,2],[53,3],[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,2],[57,3],[57,3],[57,3],[46,1],[46,2],[46,2],[58,3],[58,3],[58,3],[58,1],[58,2],[58,3],[58,1],[58,1],[58,2],[58,2],[58,2],[58,2],[58,2],[58,1],[60,0],[60,1],[63,1],[63,3],[64,2],[64,2],[64,2],[64,3],[64,3],[64,3],[61,0],[61,1],[65,1],[65,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,"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,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]],
 performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
 /* this == yyval */
 
@@ -158,25 +158,28 @@ break;
 case 27:
  this.$ = { code: "ref", ref: $$[$0].value, start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 28: case 47: case 61: case 89:
+case 28:
+ this.$ = { code: "ref", ref: "@" + $$[$0].value, start: $$[$0-1].start, end: $$[$0].end}; 
+break;
+case 29: case 48: case 62: case 90:
  this.$ = $$[$0]; 
 break;
-case 29:
+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 }; 
 break;
-case 30:
+case 31:
  this.$ = { code: "vector", vector: s.as_ref($$[$0-1]), start: $$[$0-2].start, end: $$[$0].end }; 
 break;
-case 31:
+case 32:
  this.$ = { code: "union", union: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end }; 
 break;
-case 32:
+case 33:
  this.$ = {}; 
 break;
-case 33:
+case 34:
  this.$ = $$[$0].reduce((r, lc) => { 
                                             if (r[lc.label])
                                                 anError(this._$,`Duplicate label '${lc.label}'.`);
@@ -184,49 +187,49 @@ case 33:
                                             return r }
                                         , {}); 
 break;
-case 34: case 52: case 90:
+case 35: case 53: case 91:
  this.$ = [$$[$0]]; 
 break;
-case 35: case 53: case 91:
+case 36: case 54: case 92:
  this.$ = [].concat($$[$0-2],$$[$0]); 
 break;
-case 36: case 37: case 38:
+case 37: case 38: case 39:
  this.$ = {label: $$[$0].value, code: $$[$0-1]}; 
 break;
-case 39: case 40: case 41:
+case 40: case 41: case 42:
  this.$ = {label: $$[$0-2].value, code: $$[$0]}; 
 break;
-case 42:
+case 43:
  this.$ = { type: "code", code: s.as_ref($$[$0]), start: $$[$0-1].start, end: $$[$0].end}; 
 break;
-case 43:
+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}; 
 break;
-case 44:
+case 45:
  this.$ = { type: "union", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 45:
+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 46:
+case 47:
  this.$ = { type: "vector", vector: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end }; 
 break;
-case 48:
+case 49:
  this.$ = { name: $$[$0].value, ...$$[$0-2], start: $$[$0-2].start, end: $$[$0].end }; 
 break;
-case 49:
+case 50:
  this.$ = { type: 'name', name: $$[$0].value, open: true, start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 50:
+case 51:
  this.$ = { fields: {}}; 
 break;
-case 51:
+case 52:
  this.$ = $$[$0].reduce((r, lc) => {
                                                   if (lc.dots) {
                                                     r.open = true;
@@ -238,61 +241,61 @@ case 51:
                                                   return r }
                                                 , { fields: {} }); 
 break;
-case 54:
+case 55:
  this.$ = {dots: true }; 
 break;
-case 55: case 56: case 57:
+case 56: case 57: case 58:
  this.$ = {label: $$[$0].value, filter: $$[$0-1]}; 
 break;
-case 58: case 59: case 60:
+case 59: case 60: case 61:
  this.$ = {label: $$[$0-2].value, filter: $$[$0]}; 
 break;
-case 62:
+case 63:
  this.$ = {...comp($$[$0-1], $$[$0]), start: $$[$0-1].start, end:$$[$0].end}; 
 break;
-case 63:
+case 64:
  this.$ = {op: 'caret', caret: $$[$0-1], start: $$[$0-1].start, end:$$[$0].end}; 
 break;
-case 64:
+case 65:
  this.$ = {...$$[$0-1], start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 65:
+case 66:
  this.$ = {op: "vector", vector: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 66:
+case 67:
  this.$ = {...union($$[$0-1]), start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 67:
+case 68:
  this.$ = {op: "ref", ref: $$[$0].value, start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 68:
+case 69:
  this.$ = {...identity, start: $$[$0-1].start, end: $$[$0].end};  
 break;
-case 69:
+case 70:
  this.$ = {...$$[$0-1], start: $$[$0-2].start, end: $$[$0].end };  
 break;
-case 70:
+case 71:
  this.$ = {op: "str", str: $$[$0].value, start: $$[$0].start, end: $$[$0].end }; 
 break;
-case 71:
+case 72:
  this.$ = {op: "int", int: $$[$0].value, start: $$[$0].start, end: $$[$0].end }; 
 break;
-case 72: case 73: case 74:
+case 73: case 74: case 75:
  this.$ = {op: "dot", dot: $$[$0].value, start: $$[$0-1].start, end: $$[$0].end }; 
 break;
-case 75:
+case 76:
  this.$ = {op: "code", code: s.as_ref($$[$0]), start: $$[$0-1].start, end: $$[$0].end}; 
 break;
-case 76:
+case 77:
  this.$ = {op: "filter", filter: $$[$0], start: $$[$0-1].start, end:$$[$0].end}; 
 break;
-case 77:
+case 78:
  this.$ = {op: "pipe", start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 78:
+case 79:
  this.$ = {op: "product", product: []}; 
 break;
-case 79:
+case 80:
  $$[$0].product.reduce( (labels, {label}) =>
                                             { if (labels[label]) 
                                                 anError(this._$,`Duplicate label '${label}'.`)
@@ -300,24 +303,24 @@ case 79:
                                               return labels; }, {});
                                           this.$ = $$[$0]; 
 break;
-case 80:
+case 81:
  this.$ = {op: "product", product: [$$[$0]]}; 
 break;
-case 81:
+case 82:
  $$[$0-2].product = [].concat($$[$0-2].product,$$[$0]); this.$ = $$[$0-2]; 
 break;
-case 82: case 83: case 84:
+case 83: case 84: case 85:
  this.$ = {label: $$[$0].value, exp: $$[$0-1]}; 
 break;
-case 85: case 86: case 87:
+case 86: case 87: case 88:
  this.$ = {label: $$[$0-2].value, exp: $$[$0]}; 
 break;
-case 88:
+case 89:
  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: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,58:9,62:$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],58:30,59:$Vc,62:$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,61]),o([4,6,8,10,12,14,16,18,20,22,24,26,30,32,34,36,38,40,47,59,62],[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,78],29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:45,58:9,60:42,62:$Vb,63:43,64: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,58:9,61:49,62:$Vb,65: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,58:9,61:52,62:$Vb,65: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,58:9,62:$Vb},o($Vg,$Vj),o($Vg,$Vk),{3:58,4:$V1,5:57,6:$V2,7:56,8:$V3},{3:61,4:$V1,9:64,10:$V4,11:65,12:$V5,13:66,14:$V6,15:63,16:$V7,37:62,38:$V9,53:60,55:59},o($Vg,[2,77]),o([4,6,8,10,12,14,16,20,28,30,38,40,62],[2,5]),o([4,6,8,10,12,14,16,22,30,38,40,62],[2,6]),o([4,6,8,10,12,14,16,18,28,30,38,40,62],[2,4]),o([4,6,8,10,12,14,16,24,28,30,38,40,62],[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,62]),o($Vg,[2,63]),o($Vg,$Ve),{3:67,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:68,58:9,62:$Vb},o($V0,[2,12]),o($Vd,$Vn,{25:69,26:$Vf}),o($Vg,[2,75]),o($Vo,[2,28]),{3:74,4:$V1,5:75,6:$V2,7:76,8:$V3,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,20:$Vp,48:38,49:73,50:70,51:71,52:72},{3:67,4:$V1,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:38,49:77},{3:74,4:$V1,5:75,6:$V2,7:76,8:$V3,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,18:$Vp,48:38,49:73,50:78,51:71,52:72},{19:79,20:$Vq},{20:[2,79],31:81,32:$Vr},o($Vs,[2,80]),{3:83,4:$V1,5:84,6:$V2,7:85,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,58:30,59:$Vc,62:$Vb},o($Vt,$Ve,{35:86,36:$Vu}),o($Vt,$Vj,{35:88,36:$Vu}),o($Vt,$Vk,{35:89,36:$Vu}),{21:90,22:$Vv},o([18,22],[2,89],{31:92,32:$Vr}),o($Vw,[2,90],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,58: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,59:$Vc,62:$Vb}),{17:93,18:$Vx},o($Vg,[2,68]),{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:95,24:$Vi,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,58:30,59:$Vc,62:$Vb},o($Vo,[2,11]),o($Vg,[2,72]),o($Vg,[2,73]),o($Vg,[2,74]),o($Vg,[2,76]),o($Vg,[2,47],{26:[1,96]}),o($Vg,$Vy),{3:67,4:$V1,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:38,49:97},{3:103,4:$V1,5:104,6:$V2,7:105,8:$V3,9:64,10:$V4,11:65,12:$V5,13:66,14:$V6,15:63,16:$V7,24:$Vz,27:101,28:$VA,37:62,38:$V9,53:60,54:98,55:102,56:99,57:100},{3:103,4:$V1,5:104,6:$V2,7:105,8:$V3,9:64,10:$V4,11:65,12:$V5,13:66,14:$V6,15:63,16:$V7,18:$Vz,27:101,28:$VA,37:62,38:$V9,53:60,54:107,55:102,56:99,57:100},{3:103,4:$V1,5:104,6:$V2,7:105,8:$V3,9:64,10:$V4,11:65,12:$V5,13:66,14:$V6,15:63,16:$V7,20:$Vz,27:101,28:$VA,37:62,38:$V9,53:60,54:108,55:102,56:99,57:100},{3:61,4:$V1,9:64,10:$V4,11:65,12:$V5,13:66,14:$V6,15:63,16:$V7,37:62,38:$V9,53:60,55:109},o($Vo,$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:110,34:[1,111],37:33,38:$V9,39:19,40:$Va,58:30,59:$Vc,62:$Vb},{9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:112},{19:113,20:$Vq},o([18,20],[2,33],{31:114,32:$Vr}),o($VB,[2,34]),{3:115,4:$V1,5:116,6:$V2,7:117,8:$V3},o($Vm,$Vn,{35:118,36:$Vu}),{35:119,36:$Vu},{35:120,36:$Vu},{21:121,22:$Vv},{17:122,18:$Vx},o($Vg,[2,64]),o($Vo,[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,58:9,62:$Vb,64:123},o([4,6,8,10,12,14,16,28,30,38,40,62],[2,15]),o($Vt,$Ve,{20:$VC,32:$VC}),o($Vt,$Vj,{20:$VD,32:$VD}),o($Vt,$Vk,{20:$VE,32:$VE}),{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,58:9,62:$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:125,58:9,62:$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:126,58:9,62:$Vb},o($Vg,[2,65]),o($Vo,[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:127,58:9,62:$Vb},o($Vg,[2,66]),o($Vo,[2,8]),o($Vg,[2,69]),{3:128,4:$V1},o($Vo,[2,42]),{23:129,24:$Vi},o([18,20,24],[2,51],{31:130,32:$Vr}),o($VF,[2,52]),o($VF,[2,54]),{3:131,4:$V1,5:132,6:$V2,7:133,8:$V3},o($Vm,$Vy,{35:134,36:$Vu}),{35:135,36:$Vu},{35:136,36:$Vu},o($VF,[2,13]),{17:137,18:$Vx},{19:138,20:$Vq},{21:139,22:$Vv},o($V0,[2,25]),o($V0,[2,16]),{34:[1,140]},o($Vo,[2,29]),{3:74,4:$V1,5:75,6:$V2,7:76,8:$V3,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:38,49:73,52:141},o($VB,[2,36]),o($VB,[2,37]),o($VB,[2,38]),{3:67,4:$V1,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:38,49:142},{3:67,4:$V1,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:38,49:143},{3:67,4:$V1,9:41,10:$V4,11:39,12:$V5,13:40,14:$V6,48:38,49:144},o($Vo,[2,30]),o($Vo,[2,31]),o($Vs,[2,81]),o($Vs,[2,85],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,58: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,59:$Vc,62:$Vb}),o($Vs,[2,86],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,58: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,59:$Vc,62:$Vb}),o($Vs,[2,87],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,58: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,59:$Vc,62:$Vb}),o($Vw,[2,91],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,58: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,59:$Vc,62:$Vb}),o($Vg,[2,48]),o($Vo,[2,43]),{3:103,4:$V1,5:104,6:$V2,7:105,8:$V3,9:64,10:$V4,11:65,12:$V5,13:66,14:$V6,15:63,16:$V7,27:101,28:$VA,37:62,38:$V9,53:60,55:102,57:145},o($VF,[2,55]),o($VF,[2,56]),o($VF,[2,57]),{3:61,4:$V1,9:64,10:$V4,11:65,12:$V5,13:66,14:$V6,15:63,16:$V7,37:62,38:$V9,53:60,55:146},{3:61,4:$V1,9:64,10:$V4,11:65,12:$V5,13:66,14:$V6,15:63,16:$V7,37:62,38:$V9,53:60,55:147},{3:61,4:$V1,9:64,10:$V4,11:65,12:$V5,13:66,14:$V6,15:63,16:$V7,37:62,38:$V9,53:60,55:148},o($Vo,[2,44]),o($Vo,[2,45]),o($Vo,[2,46]),o($V0,[2,26]),o($VB,[2,35]),o($VB,[2,39]),o($VB,[2,40]),o($VB,[2,41]),o($VF,[2,53]),o($VF,[2,58]),o($VF,[2,59]),o($VF,[2,60])],
+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,59:9,63:$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],59:30,60:$Vc,63:$Vb},o($Vd,$Ve,{25:34,26:$Vf}),{3:36,4:$V1,9:42,10:$V4,11:40,12:$V5,13:41,14:$V6,48:39,49:37,50:$Vg},o($Vh,[2,62]),o([4,6,8,10,12,14,16,18,20,22,24,26,30,32,34,36,38,40,47,60,63],[2,1]),o([4,10,12,14,50],[2,18]),{3:47,4:$V1,5:48,6:$V2,7:49,8:$V3,9:14,10:$V4,11:12,12:$V5,13:13,14:$V6,15:15,16:$V7,20:[2,79],29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:46,59:9,61:43,63:$Vb,64:44,65:45},{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:$Vi,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:52,59:9,62:50,63:$Vb,66:51},{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:$Vi,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:52,59:9,62:53,63:$Vb,66:51},{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:54,24:$Vj,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,46:55,59:9,63:$Vb},o($Vh,$Vk),o($Vh,$Vl),{3:59,4:$V1,5:58,6:$V2,7:57,8:$V3},{3:62,4:$V1,9:65,10:$V4,11:66,12:$V5,13:67,14:$V6,15:64,16:$V7,37:63,38:$V9,54:61,56:60},o($Vh,[2,78]),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,63],[2,7]),o($Vm,[2,2]),o($Vm,[2,3]),o($Vn,[2,14]),o([4,10,12,14,16,38],[2,19]),{1:[2,21]},o($Vh,[2,63]),o($Vh,[2,64]),o($Vh,$Ve),{3:68,4:$V1,9:42,10:$V4,11:40,12:$V5,13:41,14:$V6,48:39,49:37,50:$Vg},{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:69,59:9,63:$Vb},o($V0,[2,12]),o($Vd,$Vo,{25:70,26:$Vf}),o($Vh,[2,76]),{3:71,4:$V1},o($Vp,[2,29]),{3:76,4:$V1,5:77,6:$V2,7:78,8:$V3,9:42,10:$V4,11:40,12:$V5,13:41,14:$V6,20:$Vq,48:39,49:75,50:$Vg,51:72,52:73,53:74},{3:68,4:$V1,9:42,10:$V4,11:40,12:$V5,13:41,14:$V6,48:39,49:79,50:$Vg},{3:76,4:$V1,5:77,6:$V2,7:78,8:$V3,9:42,10:$V4,11:40,12:$V5,13:41,14:$V6,18:$Vq,48:39,49:75,50:$Vg,51:80,52:73,53:74},{19:81,20:$Vr},{20:[2,80],31:83,32:$Vs},o($Vt,[2,81]),{3:85,4:$V1,5:86,6:$V2,7:87,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,59:30,60:$Vc,63:$Vb},o($Vu,$Ve,{35:88,36:$Vv}),o($Vu,$Vk,{35:90,36:$Vv}),o($Vu,$Vl,{35:91,36:$Vv}),{21:92,22:$Vw},o([18,22],[2,90],{31:94,32:$Vs}),o($Vx,[2,91],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,59: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,60:$Vc,63:$Vb}),{17:95,18:$Vy},o($Vh,[2,69]),{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:97,24:$Vj,29:18,30:$V8,37:33,38:$V9,39:19,40:$Va,59:30,60:$Vc,63:$Vb},o($Vp,[2,11]),o($Vh,[2,73]),o($Vh,[2,74]),o($Vh,[2,75]),o($Vh,[2,77]),o($Vh,[2,48],{26:[1,98]}),o($Vh,$Vz),{3:68,4:$V1,9:42,10:$V4,11:40,12:$V5,13:41,14:$V6,48:39,49:99,50:$Vg},{3:105,4:$V1,5:106,6:$V2,7:107,8:$V3,9:65,10:$V4,11:66,12:$V5,13:67,14:$V6,15:64,16:$V7,24:$VA,27:103,28:$VB,37:63,38:$V9,54:61,55:100,56:104,57:101,58:102},{3:105,4:$V1,5:106,6:$V2,7:107,8:$V3,9:65,10:$V4,11:66,12:$V5,13:67,14:$V6,15:64,16:$V7,18:$VA,27:103,28:$VB,37:63,38:$V9,54:61,55:109,56:104,57:101,58:102},{3:105,4:$V1,5:106,6:$V2,7:107,8:$V3,9:65,10:$V4,11:66,12:$V5,13:67,14:$V6,15:64,16:$V7,20:$VA,27:103,28:$VB,37:63,38:$V9,54:61,55:110,56:104,57:101,58:102},{3:62,4:$V1,9:65,10:$V4,11:66,12:$V5,13:67,14:$V6,15:64,16:$V7,37:63,38:$V9,54:61,56:111},o($Vp,$Vo),{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:112,34:[1,113],37:33,38:$V9,39:19,40:$Va,59:30,60:$Vc,63:$Vb},{9:42,10:$V4,11:40,12:$V5,13:41,14:$V6,48:114},o($Vp,[2,28]),{19:115,20:$Vr},o([18,20],[2,34],{31:116,32:$Vs}),o($VC,[2,35]),{3:117,4:$V1,5:118,6:$V2,7:119,8:$V3},o($Vn,$Vo,{35:120,36:$Vv}),{35:121,36:$Vv},{35:122,36:$Vv},{21:123,22:$Vw},{17:124,18:$Vy},o($Vh,[2,65]),o($Vp,[2,9]),{3:47,4:$V1,5:48,6:$V2,7:49,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:46,59:9,63:$Vb,65:125},o([4,6,8,10,12,14,16,28,30,38,40,50,63],[2,15]),o($Vu,$Ve,{20:$VD,32:$VD}),o($Vu,$Vk,{20:$VE,32:$VE}),o($Vu,$Vl,{20:$VF,32:$VF}),{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:126,59:9,63:$Vb},o([4,6,8,10,12,14,16,30,38,40,50,63],[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:127,59:9,63:$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:128,59:9,63:$Vb},o($Vh,[2,66]),o($Vp,[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:129,59:9,63:$Vb},o($Vh,[2,67]),o($Vp,[2,8]),o($Vh,[2,70]),{3:130,4:$V1},o($Vp,[2,43]),{23:131,24:$Vj},o([18,20,24],[2,52],{31:132,32:$Vs}),o($VG,[2,53]),o($VG,[2,55]),{3:133,4:$V1,5:134,6:$V2,7:135,8:$V3},o($Vn,$Vz,{35:136,36:$Vv}),{35:137,36:$Vv},{35:138,36:$Vv},o($VG,[2,13]),{17:139,18:$Vy},{19:140,20:$Vr},{21:141,22:$Vw},o($V0,[2,25]),o($V0,[2,16]),{34:[1,142]},o($Vp,[2,30]),{3:76,4:$V1,5:77,6:$V2,7:78,8:$V3,9:42,10:$V4,11:40,12:$V5,13:41,14:$V6,48:39,49:75,50:$Vg,53:143},o($VC,[2,37]),o($VC,[2,38]),o($VC,[2,39]),{3:68,4:$V1,9:42,10:$V4,11:40,12:$V5,13:41,14:$V6,48:39,49:144,50:$Vg},{3:68,4:$V1,9:42,10:$V4,11:40,12:$V5,13:41,14:$V6,48:39,49:145,50:$Vg},{3:68,4:$V1,9:42,10:$V4,11:40,12:$V5,13:41,14:$V6,48:39,49:146,50:$Vg},o($Vp,[2,31]),o($Vp,[2,32]),o($Vt,[2,82]),o($Vt,[2,86],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,59: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,60:$Vc,63:$Vb}),o($Vt,[2,87],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,59: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,60:$Vc,63:$Vb}),o($Vt,[2,88],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,59: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,60:$Vc,63:$Vb}),o($Vx,[2,92],{11:12,13:13,9:14,15:15,5:16,7:17,29:18,39:19,59: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,60:$Vc,63:$Vb}),o($Vh,[2,49]),o($Vp,[2,44]),{3:105,4:$V1,5:106,6:$V2,7:107,8:$V3,9:65,10:$V4,11:66,12:$V5,13:67,14:$V6,15:64,16:$V7,27:103,28:$VB,37:63,38:$V9,54:61,56:104,58:147},o($VG,[2,56]),o($VG,[2,57]),o($VG,[2,58]),{3:62,4:$V1,9:65,10:$V4,11:66,12:$V5,13:67,14:$V6,15:64,16:$V7,37:63,38:$V9,54:61,56:148},{3:62,4:$V1,9:65,10:$V4,11:66,12:$V5,13:67,14:$V6,15:64,16:$V7,37:63,38:$V9,54:61,56:149},{3:62,4:$V1,9:65,10:$V4,11:66,12:$V5,13:67,14:$V6,15:64,16:$V7,37:63,38:$V9,54:61,56:150},o($Vp,[2,45]),o($Vp,[2,46]),o($Vp,[2,47]),o($V0,[2,26]),o($VC,[2,36]),o($VC,[2,40]),o($VC,[2,41]),o($VC,[2,42]),o($VG,[2,54]),o($VG,[2,59]),o($VG,[2,60]),o($VG,[2,61])],
 defaultActions: {29:[2,21]},
 parseError: function parseError (str, hash) {
     if (hash.recoverable) {
@@ -830,24 +833,26 @@ case 17:return 38;
 break;
 case 18:return 40;
 break;
-case 19:return 62;
+case 19:return 63;
+break;
+case 20:return 60;
 break;
-case 20:return 59;
+case 21:return 50;
 break;
-case 21:return 6;
+case 22:return 6;
 break;
-case 22:return 4;
+case 23:return 4;
 break;
-case 23:return 8;
+case 24:return 8;
 break;
-case 24:return 42;
+case 25:return 42;
 break;
-case 25:return 47;
+case 26: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],"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,26],"inclusive":true}}
 });
 return lexer;
 })();

package/patterns.mjs

@@ -8,7 +8,7 @@ import { assignCanonicalNames } from "./export.mjs";
 const unitCode = codes.unitCode;
 
 function relDefToString(relDef) {
-
+  const start = new Date().getTime();
   const dumpPatterns = (rel) => {
     switch (rel.op) {
       case "product":
@@ -39,14 +39,20 @@ function relDefToString(relDef) {
   // console.log(relDef.typePatternGraph.edges);
   // console.log(relDef.def);
   
-  return JSON.stringify(dumpPatterns(relDef.def).map((x) => {
+  const result = JSON.stringify(dumpPatterns(relDef.def).map((x) => {
     const { pattern, fields, type} = relDef.typePatternGraph.get_pattern(x);
     return {pattern, fields, type};
   }));
+
+  let took = new Date().getTime() - start;
+  if (took > 200) {
+    console.log(` -- RelDefToString: size=${result.length}, took ${took} msecs`);
+  }
+  return result;
 }
 
 function compactRel(relDef, name = "") {
-  // console.log("********************************* compacting", name);
+  const start = new Date().getTime();
   const {def, typePatternGraph, varRefs } = relDef;
   // console.log("COMPACTING typePatternGraph of size", typePatternGraph.size());
 
@@ -92,7 +98,10 @@ function compactRel(relDef, name = "") {
     outputPatternId: renumbering[x.outputPatternId]
   }));;
     
-  // console.log(`COMPACTED ${name}.typePatternGraph`, typePatternGraph.size(), '->', newTypePatternGraph.size());
+  const time = new Date().getTime() - start;
+  if (time > 500 ) {
+    console.log(`[${new Date().getTime() - start} msecs] - COMPACTED ${name}.typePatternGraph [${typePatternGraph.size()}->${newTypePatternGraph.size()}]`);
+  }
   return {def: newDef, typePatternGraph: newTypePatternGraph, varRefs: newVarRefs};
 }
 
@@ -462,7 +471,7 @@ function patterns(representatives, rels) {
   //    we will also generate the canonical representation of the relations in C and replace 
   //    the name to the relation by the hash of the canonical representation    
 
-  // console.log("----- SCC in order", sccInOrder);
+  // console.log("- SCC in order", sccInOrder);
 
   for (const scc of sccInOrder) {
 
@@ -470,7 +479,7 @@ function patterns(representatives, rels) {
     
     for (let iteration = 1; iteration <= maxNumberOfIterations; iteration++) {
       
-      // console.log(`>>>>>> Iteration ${iteration}  for SCC: { ${DAGnodes[scc].scc} }`);
+      // console.log(`-- Iteration ${iteration}/${maxNumberOfIterations} for SCC: { ${DAGnodes[scc].scc} }`);
       //    4.1 For every r in C, compute the new typePatternGraph of r, i.e.:
 
       let before = JSON.stringify(DAGnodes[scc].scc.map( relName => {
@@ -481,11 +490,11 @@ function patterns(representatives, rels) {
         // console.log(relDefToString(rels[relName]));
         return relDefToString(rels[relName]);
       }));
-    
+
       let after = JSON.stringify(DAGnodes[scc].scc.map( relName => {
         const relDef = compactRel(rels[relName],relName);
         for (let i = 0; i < relDef.varRefs.length; i++) {
-          // console.log(` ####### Processing ${relName}(..x${i}=${relDef.varRefs[i].varName}..)`);
+          const start = new Date().getTime();
           let varRel = relDef.varRefs[i];
           let { varName } = varRel;
           try {
@@ -493,7 +502,6 @@ function patterns(representatives, rels) {
             let varInputPatternId = varRootDef.typePatternGraph.find(varRootDef.def.patterns[0]);
             let varOutputPatternId = varRootDef.typePatternGraph.find(varRootDef.def.patterns[1]);
             let cloned = varRootDef.typePatternGraph.clone([varInputPatternId, varOutputPatternId], relDef.typePatternGraph);
-              
             relDef.typePatternGraph.unify(`ref:input ${relName}(${varName})`, varRel.inputPatternId, cloned[varInputPatternId]);
             relDef.typePatternGraph.unify("ref:output", varRel.outputPatternId, cloned[varOutputPatternId]);
           } catch (e) {
@@ -502,6 +510,10 @@ function patterns(representatives, rels) {
  - ${e.message}`;       
             throw e;
           }
+          const tookMs = new Date().getTime() - start;
+          if (tookMs > 200) {
+            console.log(` ---- Processing ${relName}(.., x${i}=${relDef.varRefs[i].varName}, ..) took: ${tookMs} ms`); 
+          }
         }
         rels[relName] = compactRel(relDef,relName);
         return relDefToString(rels[relName]); 

package/typing.mjs

@@ -3,20 +3,36 @@ import codes from "./codes.mjs";
 
 const unitCode = codes.unitCode;
 
-function asMapSet(vector) { 
-  return vector.reduce( (mapSet, x) => ({...mapSet, [JSON.stringify(x)]: x}), {})
+function asSet(vector) { 
+  return Array.from(new Set(vector));
 };
 
 function setUnion(...vectors) {
-  return Object.values(asMapSet([].concat(...vectors)));
+  const unionSet = new Set();
+  for (const v of vectors) {
+    for (const element of v) {
+      unionSet.add(element);
+    }
+  }
+  return Array.from(unionSet);
 }
 
 function subsetP(v1,v2) {
-  const v2Set = asMapSet(v2);
-  return Object.keys(asMapSet(v1)).every(x => x in v2Set);
+  const v2Set = new Set(v2);
+  return v1.every(x => v2Set.has(x));
 }
+
 function eqsetP(v1,v2) {
-  return subsetP(v1,v2) && subsetP(v2,v1);
+  const v1Set = new Set(v1);
+  const v2Set = new Set(v2);
+  if (v1Set.size != v2Set.size) return false;
+
+  for (const value of v1Set) {
+    if (!v2Set.has(value)) {
+      return false;
+    }
+  }
+  return true;
 }
 
 const matchAllPattern = {pattern: '(...)', fields: []};
@@ -76,7 +92,7 @@ class TypePatternForest {
     // const node = {...flatTypePattern, _id: id};
     const node = {...flatTypePattern}
     that.nodes.push(node);
-    Object.values(asMapSet(children.map(that.find.bind(that))))
+    Array.from(new Set(children.map(that.find.bind(that))))
     .forEach(rep => {that.parent[rep] = id});
     return id;
   }
@@ -139,7 +155,6 @@ class TypePatternGraph {
     for( const id of singletonPatterns) {
       this.unify('singleton', id, this.getTypeId(representatives[`-${id}-`]));
     }
-
   }
 
 
@@ -165,27 +180,29 @@ class TypePatternGraph {
       )
     );
 
-    const gEdgesWithoutParrallelEdges  = Object.values(asMapSet(gEdges));
-   
+    const gEdgesWithoutParrallelEdges  = Array.from(new Set(gEdges));
     const gGraph = new Graph(gEdgesWithoutParrallelEdges);
     const queue = gNodes.filter(x => 
       this.patterns.nodes[x].pattern in {'()':1, '(...)':1,'{...}':1, '<...>':1});
-    const excluded = asMapSet(queue);
+    const excludedSet = new Set(queue);
+
     while (queue.length > 0) {
       const x = queue.pop();
       for (const e of gGraph.dst[x] || []) {
         const y = gGraph.edges[e].src;
-        if (y in excluded) continue;
-        excluded[y] = y;
+        if (excludedSet.has(y)) continue;
+        excludedSet.add(y);
         queue.push(y);
       }
     }
-    return gNodes.filter(x => !((x in excluded) || (this.patterns.nodes[x].pattern == 'type')));
+
+    return gNodes.filter(x => !((excludedSet.has(x)) || (this.patterns.nodes[x].pattern == 'type')));
   }
 
   getCompressed() {
     const newTypePatternGraph = new TypePatternGraph();
     const renamed = this.cloneAll(newTypePatternGraph);
+
     newTypePatternGraph.turnSingletonPatternsIntoCodes();
 
     Object.keys(renamed).forEach( id => {
@@ -223,7 +240,9 @@ class TypePatternGraph {
     
     // console.log("equivalence", equivalence);
 
+    let count = 0;
     const areDifferent = (i1,i2) => {
+      count++;
       const p1 = newTypePatternGraph.get_pattern(i1);
       const p2 = newTypePatternGraph.get_pattern(i2);
       if (p1.pattern != p2.pattern) return true;
@@ -239,7 +258,9 @@ class TypePatternGraph {
       return false;
     }
     let changed = true;
+    let count2 = 0;
     while (changed) {
+      count2++;
       changed = false;
       const equivalenceSize = equivalence.length;
       for (let eqClassPos = 0; eqClassPos < equivalenceSize; eqClassPos++) {
@@ -285,7 +306,7 @@ class TypePatternGraph {
     for (const oldId in newIds) {
       const newId = newIds[oldId];
       const pattern = newTypePatternGraph.get_pattern(oldId);
-      const newPattern = compressedTypePatternGraph.get_pattern(newId);
+      // const newPattern = compressedTypePatternGraph.get_pattern(newId);
       // console.log("patterns", pattern, newPattern);
       if (pattern.pattern == 'type') 
         continue;
@@ -294,7 +315,7 @@ class TypePatternGraph {
       compressedTypePatternGraph.edges[newId] = {};
       for (const lab in edges) {
         // console.log("edges[lab]", edges[lab]);
-        compressedTypePatternGraph.edges[newId][lab] = asMapSet(Object.values(edges[lab]).map(x => 
+        compressedTypePatternGraph.edges[newId][lab] = asSet(edges[lab].map(x => 
           newIds[reps[newTypePatternGraph.find(x)][0]]));
       }
     }
@@ -308,6 +329,7 @@ class TypePatternGraph {
     // console.log("nodes", compressedTypePatternGraph.patterns.nodes);
     // console.log("edges", compressedTypePatternGraph.edges);
     // console.log("--------------------")
+
     return {typePatternGraph: compressedTypePatternGraph, remapping};
   }
 
@@ -343,7 +365,7 @@ class TypePatternGraph {
       const new_id = result[i];
       targetGraph.edges[new_id] = {};
       for (const lab in edges) {
-        targetGraph.edges[new_id][lab] = asMapSet(Object.values(edges[lab]).map(x => result[find(x)]));
+        targetGraph.edges[new_id][lab] = asSet(edges[lab].map(x => result[find(x)]));
       }
     }
     return result;
@@ -584,7 +606,7 @@ class TypePatternGraph {
 
   unify(rule, ...ids) {
     const find = (x) => this.find(x);
-    const reps = Object.values(asMapSet(ids.map(find)));
+    const reps = Array.from(new Set(ids.map(find))); 
     if (reps.length < 2) return false;
     const rep_patters = reps.map(x => {
       const pattern = this.get_pattern(x);
@@ -615,8 +637,8 @@ class TypePatternGraph {
       for (const lab in edges) {
         // if the pattern is [] all labels are treated as 'vector-member'
         const new_lab = new_pattern.pattern == '[]' ? 'vector-member' : lab;
-        const dests = asMapSet(Object.values(edges[lab]).map(find));
-        this.edges[new_id][new_lab] = {...this.edges[new_id][new_lab], ...dests};
+        const dests = asSet(edges[lab].map(find));
+        this.edges[new_id][new_lab] = asSet([...(this.edges[new_id][new_lab] || []), ...dests]);
       }
     }
     // add stuff for types
@@ -629,7 +651,7 @@ class TypePatternGraph {
             // all edges are goin to unit type
             const unit_id = this.getTypeId(unitCode);
             for (const lab in this.edges[new_id]) {
-              this.edges[new_id][lab][unit_id] = unit_id;
+              this.edges[new_id][lab] = asSet([unit_id]);
             }
           }; break;
           case 'product':
@@ -637,7 +659,7 @@ class TypePatternGraph {
             const type_fields = Object.keys(code[code.code]);
             for (const lab of type_fields) {
               const target_type_id = this.getTypeId(code[code.code][lab]);
-              this.edges[new_id][lab]= {...this.edges[new_id][lab], [target_type_id]: target_type_id};
+              this.edges[new_id][lab]= asSet([...(this.edges[new_id][lab] ||[]), target_type_id]);
             }
           }; break;
           case 'vector': {
@@ -645,18 +667,13 @@ class TypePatternGraph {
             const target_type_id = this.getTypeId(code.vector);
 
             this.edges[new_id] = {
-              'vector-member': {
-                [target_type_id]: target_type_id, 
-                ...asMapSet( 
-                  setUnion(...Object.values(this.edges[new_id]).map(aSet => Object.values(aSet)))
-                )
-              }
+              'vector-member': asSet([ target_type_id, ...Object.values(this.edges[new_id])])
             }
           }
         }
     }
     for ( const lab of Object.keys(this.edges[new_id]) ) {
-      this.unify(rule+'.', ...Object.values(this.edges[new_id][lab]));      
+      this.unify(rule+'.', ...this.edges[new_id][lab]);      
     }
 
     return true;
@@ -667,7 +684,7 @@ class TypePatternGraph {
     const find = (x) => this.patterns.find(x);
     this.edges[id] = {};
     for (const [lab,dest] of Object.entries(fields)) {
-      this.edges[id][lab] = asMapSet(dest.map(find));
+      this.edges[id][lab] = asSet(dest.map(find));
     }
     return id;
   }