@fraczak/k 3.1.0 → 4.0.1

package/BIG_PICTURE.md

@@ -1,3 +1,4 @@
+# Big Picture
 
 `Kernel-code` is an experiment aiming to define a "perfect programming language".
 
@@ -22,7 +23,7 @@ Types are defined by two constructs:
 1. Product
 2. Union (also called tagged or disjoint union)
 
-Given a set (possibly empty) of types `t1, t2, ..., tn` and a set of pairwise different tags (labels) `l1, l2, ..., ln`,
+Given a finite (possibly empty) set of types `t1, t2, ..., tn` and a set of pairwise different tags (labels) `l1, l2, ..., ln`,
 
 - by `{ t1 l1, t2 l2, ..., tn ln }`, we define a _product type_ with exactly `n` projection functions `.l1`, `.l2`, `...`, `.ln`,
   mapping a value of type `{t1 l1, t2 l2, ..., tn ln}` into a value of type `t1`, `t2`, `...`, `tn`, respectively.
@@ -42,7 +43,6 @@ Some properties of these types:
    as a union type value (a variant).  
 2. The empty product type `{}` has a single value, called the _unit_ and also denoted by `{}`, which has no fields.
 3. The empty union type `<>` has no values.
-4. The product and union types form dual categories.
 
 ### Partial functions
 
@@ -64,7 +64,7 @@ empty composition, `()`, defines the identity function.
 
 ### Program
 
-A `kernel-core` program is a set of definitions of types and partial functions followed by an _expression_,
+A `kernel-core` program is a set of definitions of types and partial functions, followed by an _expression_,
 which is the partial function the program defines.
 
 The language syntax is defined by:
@@ -97,7 +97,7 @@ The `typing` expression acts as a type annotation and can be seen as a 'filter',
 function defined only for the values of the corresponding type.
 
 That's it.
-No `int`, no `if` statement, no `loop`, no `throw`, no _closure_, no _annotations_, and no macros.
+No `builtin` types, no `if` statement, no `loop`, no `throw`, no _closure_, no _annotations_, and no macros.
 Just types and partial functions.
 
 ### Normalization
@@ -170,50 +170,59 @@ Functions `bit0`, `bit1`, and `zero` are "constant polymorphic functions", meani
 
 - constant: if defined, they always return exactly the same value;
 - polymorphic: they are defined for more than one pair of input and output type: functions
-  `bit0` and `bit1` are of type `X -> bit`, and `zero` is of type `X -> byte`, where `X`
-  denotes an unconstrained type pattern.
+  `bit0` and `bit1` are of type `?X -> $bit`, and `zero` is of type `?X -> $byte`, where `?X`
+  denotes an unconstrained type pattern, also denoted as `?(...)`.
 
 Functions `inc` and `inc3` are (non-polymorphic) functions of types
-`byte -> { bit overflown, byte byte }` and
-`{ bit overflown, byte byte } -> { bit overflown, byte byte }`, respectively.
+`$byte -> ${ bit overflown, byte byte }` and
+`${ bit overflown, byte byte } -> ${ bit overflown, byte byte }`, respectively.
 
-Function `inc_o` is a polymorphic function of type patterns: `X -> Y` with
-following constraints:
+Function `inc_o` is a polymorphic function of type patterns: `?X -> ${ byte byte, bit overflown }` 
+with following constraints:
 
-- `X` is a product type with at least two fields: `byte` and `overflown`, denoted by:
-   > `?{ byte byte, Z overflown, ...}`;
-- `Z` is a type (union or product) with field `i` denoted by:
+- `?X` is a product or union type with at least two fields: `byte` and `overflown`, denoted by:
+   > `?( $byte byte, Z overflown, ...)`;
+- `?Z` is a type (union or product) with field `i` denoted by:
    > `?( V i, ...)`;
-- `V` is unconstrained;
-- `Y` is a product type with exactly two fields: `byte` and `overflown`, denoted by:
-   > `?{ byte byte, bit overflown }`;
+- `V` is unconstrained, denoted by `(...)`;
 
-The type pattern for `Y` is _singleton_, as only one type fits the pattern,
-whereas the other type patterns are not.
+We could write it as: `?($byte byte, ((...) i, ...) overflown, ...)`.
 
-In this example, we were able to find the most general type pattern for all sub-expressions of the program. 
-However, we still do not have a way to find the most general type patterns in the general case.
-This is work in progress.
+The target type `${ byte byte, bit overflown }` was derived from pattern `?{ $byte byte, $bit overflown }`.
+Such a pettern is called _singleton pattern_ as only one type fits the pattern.
 
 ## Universal Schema Registry
 
-Since the normalization process for types is fast and deterministic, we can build a universal schema registry that will store all invented types. 
-The registry will be a key-value store, where the key is the hash of the normalized type, and the value is the normalized type itself.
+Since the normalization process for types is fast and deterministic, we can build a universal
+schema registry that will store all invented types. 
+The registry will be a key-value store, where the key is the hash of the normalized type,
+and the value is the normalized type itself.
 
-All functions (non-polymorphic and polymorphic) will be renamed by the hash of their normalized definition and stored in the similar key-value store.
+All functions (non-polymorphic and polymorphic) will be renamed by the hash of their normalized
+definition and stored in the similar key-value store.
 
-Non-polymorphic functions can be easily indexed by the hashes of their input and output types so that we can quickly find the function we need, e.g., for autocomplition.
-Searching for polymorphic functions is more complicated, as we need to find the function whose input and output type patterns fit given types.
+Non-polymorphic functions can be easily indexed by the hashes of their input and output types
+so that we can quickly find the function we need.
+Searching for polymorphic functions is more complicated, as we need to find the function
+whose input and output type patterns fit given types.
 
 ## Serialization and Compilation
 
-The language is designed to transform _codes_, i.e., serialized typed values, i.e., trees accepted by a tree automaton, into other _codes_.
+The language is designed to transform _codes_, i.e., serialized typed values, i.e., trees
+accepted by a tree automaton, into other _codes_.
 The transformation is done by partial functions as defined in the language.
-The non-recursive and tail-recursive (and even some non-tail recursive) functions can be compiled into deterministic finite (pushdown) transducers.
+The non-recursive and tail-recursive (and even some non-tail recursive) functions can
+be compiled into deterministic finite (pushdown) transducers.
 
 ### AND-OR graphs for enconding and decoding codes
 
+This could be generic and compact way to encode and decode typed values.
+The idea is to use _prefix codes_ (a class of languages such that no word is a prefix of
+another word) to encode the values.
 
+### RUST data structures
+
+A type can be translated into a Rust data structure, and a function can be translated into a Rust function.
 
 ## Linking with Other Languages
 

package/Code-derivation-tests/vector.mjs

@@ -16,7 +16,4 @@ t("$int [ $int true, false ] .0",  (annotated) => {
 });
 
 assert.throws(() => t(`$int [ $int true, 12 ]`), /Error/);
-console.log("The both errors are expected...");
 console.log("OK");
-
-// t(`[]`);

package/Filters/bug.k

@@ -0,0 +1,3 @@
+swap = ?{<...> x, Y y} {.x y, .y x} .y ?Y; 
+
+{"asd" x, "a" y} swap .asd

package/Filters/composing.k

@@ -0,0 +1,15 @@
+remap = ?T {.x y} ?T ?<X z, ...>; 
+swap =  ?T {.x y, .y x} ?T;
+
+$t = <int x, int y>;
+
+$t2 = <int x, int y, int z>;
+
+-- {12 x} $t remap $t
+-- {[1,2] x} remap
+-- {"ala" x, 3 y} swap 
+
+{
+    {12 x} $t2 remap $t2 remap,
+    {"ala" x, "ola" y} swap 
+}

package/Filters/filter.k

@@ -0,0 +1,9 @@
+f1 = ?{T x, [T] y};
+f2 = ?{[R] x, R y};
+
+swap = f1 f2 {.x y, .y x};
+
+
+{[] x, [[[[]]]] y} swap
+
+-- shoud_work

package/README.md

@@ -87,7 +87,7 @@ supported.
 
 ### Basic extensions
 
-#### Constants, i.e., literals for `strings`, `integers`, `booleans`, and `null`
+#### Constants, i.e., literals for `string`, `int`, `bool`, and `null`
 
 A constant defines a function which ignores its argument and produces
 the constant value. E.g.:
@@ -95,7 +95,7 @@ the constant value. E.g.:
     {123 int, "kScript" str, true bool, null null} :
         "any"  --> {"int":123,"str":"kScript","bool":true,"null":null}
 
-Those values, i.e., `strings`, `integers`, `booleans`, and `null`, admit the
+Those values, i.e., _strings_, _integers_, _booleans_, and _null_, admit the
 projection to the canonicat string representation of the value, e.g.:
 
     .2 :
@@ -176,19 +176,19 @@ is not supported in _code derivation_ (explained below).
         "2.12"             --> 2.12
         "[1,2.11,0.3e-32]" --> [1,2.11,3e-33]
 
-
 - other predefined parial functions are: `DIV`, `FDIV`, `CONS`,
-  `SNOC`, `toDateMsec`, `toDateStr`, and `_log!`.
+  `SNOC`, `toVEC`, `toDateMsec`, `toDateStr`, and `_log!`.
 
 ---
 
 ### Function and code (i.e., _type_) definitions
 
       dec = [(),-1] PLUS;
-      max = <SNOC [.0, .1 max] <GT.0, .1>, .0> ;
+      max = <SNOC [.car, .cdr max] <GT.0, .1>, .0> ;
       factorial = < [(),0] GT .0 [dec factorial, ()] TIMES, 1 >;
 
-### Codes (schemas, i.e., _non-functional types_)
+### Codes (schemas, i.e., _types_)
+
 _Codes_ (prefixed by `$`) can be defined by tagged union and product. E.g.:
 
 
@@ -256,12 +256,15 @@ fail, indicating that the script is invalid.  In some other cases the
 code derivation can succeed even to the point of reducig every pattern
 to a single code making the program fully annotated by codes.
 
-For now, `code derivation` is supported by the core language, i.e., `composition`,
-`projection` and `union` with product and tagged union types.
+The language `k` supports _type patterns_, which is used for type inference, however the patterns are not concidered in the evaluation of the program.
+
+```k
+    tree_pattern = ?<(...) leaf, {T left, T right} tree> = T;
+```
 
 ---
 
-### List comprehension on vectors (experimental!)
+### List comprehension
 
 A vector can be "open" by PIPE (`|`) operator so the following partial function is applied to
 each element of the vector one by one, yielding another open value. An open value can be "closed", 
@@ -355,11 +358,11 @@ times value `x` appears in the list. (see `Examples/list-comprehension.k` for a
 Another example could be finding the biggest (max) value in a vector:
 
     max = < 
-      SNOC         #   [x0, x1, x2, ...] --> [x0, [x1, x2, ...]]
-      [.0, .1 max] #   [x0, [x1, x2, ...]] --> [x0, max(x1,x2,...)], i.e., recursive call 
-      <GT .0, .1>  #   if x0 > max(x1,x2,...) then x0 else max(x1,x2,...)
-    ,              # when SNOC is not defined, i.e., if the input vector has one element:
-      .0           #   [x0] --> x0
+      SNOC             #   [x0, x1, x2, ...] --> {x0 car, [x1, x2, ...] cdr}
+      [.car, .cdr max] #   [x0, [x1, x2, ...]] --> [x0, max(x1,x2,...)], i.e., recursive call 
+      <GT .0, .1>      #   if x0 > max(x1,x2,...) then x0 else max(x1,x2,...)
+    ,                  # when SNOC is not defined, i.e., if the input vector has one element:
+      .0               #   [x0] --> x0
     >; 
     max
 
@@ -468,10 +471,10 @@ For example:
 
 1.
         curl 'https://api.github.com/repositories/5101141/commits?per_page=5' | jq '.'
-        curl 'https://api.github.com/repositories/5101141/commits?per_page=5' | k  '()' -1 
+        curl 'https://api.github.com/repositories/5101141/commits?per_page=5' | k '()' -1 
 2.
         curl 'https://api.github.com/repositories/5101141/commits?per_page=5' | jq '.[0]'
-        curl 'https://api.github.com/repositories/5101141/commits?per_page=5' | k  '.0' -1 
+        curl 'https://api.github.com/repositories/5101141/commits?per_page=5' | k '.0' -1 
 3.
         jq '.[0] | {message: .commit.message, name: .commit.committer.name}'
         k '.0 {.commit.message message, .commit.committer.name name}' -1

package/TYPING.md

@@ -334,9 +334,9 @@ The binary reduce function is defined as follows (it is commutative):
 
 | f-unify  | (...) | {...} | <...> |  ()  |  []  |  {}  |  <>  | type
 |----------|-------|-------|-------|------|------|------|------|------
-|**type**  | type  | type  | type  | type | type | type | type | type
-|**<>**    |  <>   | ERROR | <>    | <>   | ERROR| ERROR| <>
-|**{}**    |  {}   |  {}   | ERROR |  {}  |  []  |  {}
+|**type**  | type  | type  | type  | type | type | type | type
+|**<>**    |  <>   | ERROR | <>    |  <>  | ERROR| ERROR| <>
+|**{}**    |  {}   |  {}   | ERROR |  {}  | ERROR|  {}
 |**[]**    |  []   |  []   | ERROR |  []  |  []
 |**()**    |  ()   |  {}   | <>    |  ()
 |**<...>** | <...> | ERROR | <...>
@@ -353,16 +353,13 @@ A comment explaining how the node was created is added as well.
 
 As the name indicates, adds an edge which can lead to many nodes.
 
-
-
-
 Repeat the procedure until the type pattern graph is not changing anymore.
 
-# TODO:
+## TODO:
 
 - [X] Redefine built-in CONS and SNOC to allign with no support for non-homogeneous lists
-- [ ] Introduce a bound for typing 
-- [ ] Check for loops, e.g., `$x = < x f, ...>`, `$x = [x]`, `$x = {x f, ...}` -- this 
+- [X] Integrate filters into typePatters (execution is not affected)
+- [/] better type error repporting - the info exists in the pattern parent tree ... in progress
+- [ ] Introduce a space/time bounds for type derivation
+- [ ] Check for loops, e.g., `$x = < x f, ...>`, `$x = [x]`, `$x = {x f, ...}` -- this
       looks a little arbitrary, but maybe this is actually an important part
-- [ ] Integrate filters into typePatters (executions?)
-- [ ] better error repporting - the info exists in the pattern parent tree

package/codes.mjs

@@ -202,8 +202,8 @@ function register(newCodes) {
 
 function find(codeName) {
   if (isBuiltIn(codeName))
-    return {code: codeName, def: "built-in["+codeName+"]"};
-  return JSON.parse(JSON.stringify(theRepository.codes[codeName]));
+    return {code: codeName, def: "builtin"};
+  return JSON.parse(JSON.stringify(theRepository.codes[codeName] || {code: "undefined"}));
 };
 
 export default { minimize, normalize, normalizeAll, encodeCodeToString, finalize, unitCode, register, find };

package/index.mjs

@@ -7,7 +7,7 @@ function compile(script) {
   try {
     run.defs = annotate(script);
   } catch (e) {
-    console.error(e);
+    console.error(e.message);
     console.error("WARN: Recompiling without type reconciliation due to the type error above.");
     const { defs, exp } = parse(script);
     const { codes, representatives } = t.finalize(defs.codes);
@@ -30,13 +30,14 @@ runScriptOnData.doc = "Run 'script' (string) on 'data': (script,data) -> data";
 
 function annotate(script) {
   const { defs, exp } = parse(script);
-  const { codes, representatives } = t.finalize(defs.codes);
+  //const { codes, representatives } = t.finalize(defs.codes);
 
+  const representatives = t.register(defs.codes);
   const rels = {...defs.rels, "__main__": {def: exp}};
 
-  const pats = patterns(codes, representatives, rels);
+  patterns(representatives, rels);
  
-  return {rels,codes,representatives, ...pats}
+  return {rels, representatives}
 }
 annotate.doc = "Annotate all the script expressions with patterns";
 

package/k.mjs

@@ -1,5 +1,4 @@
-#!/usr/bin/node --stack-size=8000
-// #!/usr/bin/env node
+#!/usr/bin/env node
 // !/usr/bin/node --stack-size=8000
 
 import fs from "node:fs";

package/package.json

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

package/parser.jison

@@ -147,15 +147,19 @@ code_label
     | int col code                      { $$ = {label: $1.value, code: $3}; }
     ;
 
-filter
-    : name                        { $$ = { type: "name", name: $1.value, start: $1.start, end: $1.end}; }
-    | dollar code                 { $$ = { type: "code", code: s.as_ref($2), start: $1.start, end: $2.end}; }
-    | lp labelled_filters      rp { $$ = { open: $2.open, fields: $2.fields, start: $1.start, end: $3.end}; }
+filter_
+    : dollar code                 { $$ = { type: "code", code: s.as_ref($2), start: $1.start, end: $2.end}; }
+    | lp labelled_filters      rp { $$ = { type: null, open: $2.open, fields: $2.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 { $$ = { 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 }; }
     ;
 
+filter
+    : filter_                      { $$ = $1; }
+    | filter_ EQ name              { $$ = { name: $3.value, ...$1, start: $1.start, end: $3.end }; }
+    | name                         { $$ = { type: 'name', name: $1.value, open: true, start: $1.start, end: $1.end}; }
+    ;
 labelled_filters
     :                                   { $$ = { fields: {}}; }
     | non_empty_labelled_filters        { $$ = $1.reduce((r, lc) => {

package/parser.mjs

@@ -111,12 +111,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,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 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 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,"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]],
+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]],
 performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
 /* this == yyval */
 
@@ -154,7 +154,7 @@ break;
 case 27:
  this.$ = { code: "ref", ref: $$[$0].value, start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 28: case 59: case 77: case 87:
+case 28: case 47: case 61: case 79: case 89:
  this.$ = $$[$0]; 
 break;
 case 29:
@@ -175,10 +175,10 @@ case 33:
                                                   return r }
                                                 , {}); 
 break;
-case 34: case 50: case 88:
+case 34: case 52: case 90:
  this.$ = [$$[$0]]; 
 break;
-case 35: case 51: case 89:
+case 35: case 53: case 91:
  this.$ = [].concat($$[$0-2],$$[$0]); 
 break;
 case 36: case 37: case 38:
@@ -188,27 +188,30 @@ case 39: case 40: case 41:
  this.$ = {label: $$[$0-2].value, code: $$[$0]}; 
 break;
 case 42:
- this.$ = { type: "name", name: $$[$0].value, start: $$[$0].start, end: $$[$0].end}; 
+ this.$ = { type: "code", code: s.as_ref($$[$0]), start: $$[$0-1].start, end: $$[$0].end}; 
 break;
 case 43:
- this.$ = { type: "code", code: s.as_ref($$[$0]), start: $$[$0-1].start, end: $$[$0].end}; 
+ this.$ = { type: null, open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
 break;
 case 44:
- this.$ = { open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
-break;
-case 45:
  this.$ = { type: "union", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 46:
+case 45:
  this.$ = { type: "product", open: $$[$0-1].open, fields: $$[$0-1].fields, start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 47:
+case 46:
  this.$ = { type: "vector", vector: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end }; 
 break;
 case 48:
- this.$ = { fields: {}}; 
+ this.$ = { name: $$[$0].value, ...$$[$0-2], start: $$[$0-2].start, end: $$[$0].end }; 
 break;
 case 49:
+ this.$ = { type: 'name', name: $$[$0].value, open: true, start: $$[$0].start, end: $$[$0].end}; 
+break;
+case 50:
+ this.$ = { fields: {}}; 
+break;
+case 51:
  this.$ = $$[$0].reduce((r, lc) => {
                                                   if (lc.dots) {
                                                     r.open = true;
@@ -218,78 +221,78 @@ case 49:
                                                   return r }
                                                 , { fields: {} }); 
 break;
-case 52:
+case 54:
  this.$ = {dots: true }; 
 break;
-case 53: case 54: case 55:
+case 55: case 56: case 57:
  this.$ = {label: $$[$0].value, filter: $$[$0-1]}; 
 break;
-case 56: case 57: case 58:
+case 58: case 59: case 60:
  this.$ = {label: $$[$0-2].value, filter: $$[$0]}; 
 break;
-case 60:
+case 62:
  this.$ = {...comp($$[$0-1], $$[$0]), start: $$[$0-1].start, end:$$[$0].end}; 
 break;
-case 61:
+case 63:
  this.$ = {op: 'caret', caret: $$[$0-1], start: $$[$0-1].start, end:$$[$0].end}; 
 break;
-case 62:
+case 64:
  this.$ = {...$$[$0-1], start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 63:
+case 65:
  this.$ = {op: "vector", vector: $$[$0-1], start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 64:
+case 66:
  this.$ = {...union($$[$0-1]), start: $$[$0-2].start, end: $$[$0].end}; 
 break;
-case 65:
+case 67:
  this.$ = {op: "ref", ref: $$[$0].value, start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 66:
+case 68:
  this.$ = {...identity, start: $$[$0-1].start, end: $$[$0].end};  
 break;
-case 67:
+case 69:
  this.$ = {...$$[$0-1], start: $$[$0-2].start, end: $$[$0].end };  
 break;
-case 68:
+case 70:
  this.$ = {op: "str", str: $$[$0].value, start: $$[$0].start, end: $$[$0].end }; 
 break;
-case 69:
+case 71:
  this.$ = {op: "int", int: $$[$0].value, start: $$[$0].start, end: $$[$0].end }; 
 break;
-case 70: case 71: case 72:
+case 72: case 73: case 74:
  this.$ = {op: "dot", dot: $$[$0].value, start: $$[$0-1].start, end: $$[$0].end }; 
 break;
-case 73:
+case 75:
  this.$ = {op: "code", code: s.as_ref($$[$0]), start: $$[$0-1].start, end: $$[$0].end}; 
 break;
-case 74:
+case 76:
  this.$ = {op: "filter", filter: $$[$0], start: $$[$0-1].start, end:$$[$0].end}; 
 break;
-case 75:
+case 77:
  this.$ = {op: "pipe", start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 76:
+case 78:
  this.$ = {op: "product", product: []}; 
 break;
-case 78:
+case 80:
  this.$ = {op: "product", product: [$$[$0]]}; 
 break;
-case 79:
+case 81:
  $$[$0-2].product = [].concat($$[$0-2].product,$$[$0]); this.$ = $$[$0-2]; 
 break;
-case 80: case 81: case 82:
+case 82: case 83: case 84:
  this.$ = {label: $$[$0].value, exp: $$[$0-1]}; 
 break;
-case 83: case 84: case 85:
+case 85: case 86: case 87:
  this.$ = {label: $$[$0-2].value, exp: $$[$0]}; 
 break;
-case 86:
+case 88:
  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,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])],
+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])],
 defaultActions: {29:[2,21]},
 parseError: function parseError (str, hash) {
     if (hash.recoverable) {
@@ -802,9 +805,9 @@ case 17:return 38;
 break;
 case 18:return 40;
 break;
-case 19:return 61;
+case 19:return 62;
 break;
-case 20:return 58;
+case 20:return 59;
 break;
 case 21:return 6;
 break;