@fraczak/k 5.0.2 → 5.1.1

package/Code-derivation-tests/built-in.mjs

@@ -9,11 +9,11 @@ function is_result_code(code) {
     }
 }
 
-t('true', is_result_code('bool'));
-t('false $bool', is_result_code('bool'));
-t('1', is_result_code('int'));
-t('12 $int', is_result_code('int'));
-t('"ala"', is_result_code('string'));
-t('"a" $string', is_result_code('string'));
+t('true', is_result_code('@bool'));
+t('false $@bool', is_result_code('@bool'));
+t('1', is_result_code('@int'));
+t('12 $@int', is_result_code('@int'));
+t('"ala"', is_result_code('@string'));
+t('"a" $@string', is_result_code('@string'));
 
-t('${} true $bool 1 $int "a" $string', is_result_code('string'));
+t('${} true $@bool 1 $@int "a" $@string', is_result_code('@string'));

package/Code-derivation-tests/dot.mjs

@@ -11,12 +11,12 @@ $b {1 one, () two, () c} .one
     const {input,output} = in_out(annotated);
     // console.log({input,output});
     assert.equal(input.type, annotated.representatives["b"]);
-    assert.equal(output.type, "int");
+    assert.equal(output.type, "@int");
     console.log("OK");
 });
 
 t(`
-    $a = < int true, bool false > ;
+    $a = < @int true, @bool false > ;
     $a .true
   `, (annotated) => {
   const {input,output} = in_out(annotated);
@@ -35,6 +35,6 @@ t(`
   const {input,output} = in_out(annotated);
   console.log({input,output});
   assert.equal(input.pattern, '(...)');
-    assert.equal(output.type, "bool");
+    assert.equal(output.type, "@bool");
     console.log("OK");
 });

package/Code-derivation-tests/vector.mjs

@@ -8,12 +8,12 @@ t('[]', (annotated) => {
   console.log("OK");
 });
 
-t("$int [ $int true, false ] .0",  (annotated) => {
+t("$@int [ $@int true, false ] .0",  (annotated) => {
   const {input,output} = in_out(annotated);
-  assert.equal(input.type, "int");
-  assert.equal(output.type, "bool");
+  assert.equal(input.type, "@int");
+  assert.equal(output.type, "@bool");
   console.log("OK");
 });
 
-assert.throws(() => t(`$int [ $int true, 12 ]`), /Error/);
+assert.throws(() => t(`$@int [ $@int true, 12 ]`), /Error/);
 console.log("OK");

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

@@ -9,7 +9,7 @@ const unitCode = function() {
 }();
 
 function isBuiltIn(code) {  
-  return code.match(/^(int|string|bool)$/);
+  return code.match(/^@(int|string|bool)$/);
 }
 
 function encodeCodeToString(code, codes = theRepository.codes) {
@@ -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,11 +1,11 @@
 {
     "name": "@fraczak/k",
-    "version": "5.0.2",
+    "version": "5.1.1",
     "description": "k-language for JSON-like data transformation",
     "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"
+        "test": "node test.mjs; for f in Code-derivation-tests/*.mjs; do echo $f; node $f; done; node test-fingerprint.mjs; ./tests.sh"
     },
     "repository": {
         "type": "git",

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; }
     ;
 
@@ -216,6 +218,7 @@ exp
     | 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}; }
     | 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 }; }

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,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 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,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 91:
  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 92:
  this.$ = [$$[$0]]; 
 break;
-case 35: case 53: case 91:
+case 36: case 54: case 93:
  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,64 @@ 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.$ = {op: "ref", ref: "@" + $$[$0].value, start: $$[$0-1].start, end: $$[$0].end}; 
+break;
+case 70:
  this.$ = {...identity, start: $$[$0-1].start, end: $$[$0].end};  
 break;
-case 69:
+case 71:
  this.$ = {...$$[$0-1], start: $$[$0-2].start, end: $$[$0].end };  
 break;
-case 70:
+case 72:
  this.$ = {op: "str", str: $$[$0].value, start: $$[$0].start, end: $$[$0].end }; 
 break;
-case 71:
+case 73:
  this.$ = {op: "int", int: $$[$0].value, start: $$[$0].start, end: $$[$0].end }; 
 break;
-case 72: case 73: case 74:
+case 74: case 75: case 76:
  this.$ = {op: "dot", dot: $$[$0].value, start: $$[$0-1].start, end: $$[$0].end }; 
 break;
-case 75:
+case 77:
  this.$ = {op: "code", code: s.as_ref($$[$0]), start: $$[$0-1].start, end: $$[$0].end}; 
 break;
-case 76:
+case 78:
  this.$ = {op: "filter", filter: $$[$0], start: $$[$0-1].start, end:$$[$0].end}; 
 break;
-case 77:
+case 79:
  this.$ = {op: "pipe", start: $$[$0].start, end: $$[$0].end}; 
 break;
-case 78:
+case 80:
  this.$ = {op: "product", product: []}; 
 break;
-case 79:
+case 81:
  $$[$0].product.reduce( (labels, {label}) =>
                                             { if (labels[label]) 
                                                 anError(this._$,`Duplicate label '${label}'.`)
@@ -300,25 +306,25 @@ case 79:
                                               return labels; }, {});
                                           this.$ = $$[$0]; 
 break;
-case 80:
+case 82:
  this.$ = {op: "product", product: [$$[$0]]}; 
 break;
-case 81:
+case 83:
  $$[$0-2].product = [].concat($$[$0-2].product,$$[$0]); this.$ = $$[$0-2]; 
 break;
-case 82: case 83: case 84:
+case 84: case 85: case 86:
  this.$ = {label: $$[$0].value, exp: $$[$0-1]}; 
 break;
-case 85: case 86: case 87:
+case 87: case 88: case 89:
  this.$ = {label: $$[$0-2].value, exp: $$[$0]}; 
 break;
-case 88:
+case 90:
  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])],
-defaultActions: {29:[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]),{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]},
 parseError: function parseError (str, hash) {
     if (hash.recoverable) {
         this.trace(str);
@@ -830,24 +836,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

@@ -174,12 +174,12 @@ function patterns(representatives, rels) {
         case "int":
           rel.patterns = [];
           rel.patterns[0] = rootDef.typePatternGraph.addNewNode();
-          rel.patterns[1] = rootDef.typePatternGraph.getTypeId('int');
+          rel.patterns[1] = rootDef.typePatternGraph.getTypeId('@int');
           break;
         case "str":
           rel.patterns = [];
           rel.patterns[0] = rootDef.typePatternGraph.addNewNode();
-          rel.patterns[1] = rootDef.typePatternGraph.getTypeId('string');
+          rel.patterns[1] = rootDef.typePatternGraph.getTypeId('@string');
           break;
         case "identity":
           rel.patterns = [];
@@ -359,39 +359,39 @@ function patterns(representatives, rels) {
       case "true": 
       case "false":
         rel.patterns[0] = rootDef.typePatternGraph.addNewNode();
-        rel.patterns[1] = rootDef.typePatternGraph.getTypeId('bool');
+        rel.patterns[1] = rootDef.typePatternGraph.getTypeId('@bool');
         break;
       case "PLUS":
       case "TIMES": 
-        rel.patterns[1] = rootDef.typePatternGraph.getTypeId('int');
+        rel.patterns[1] = rootDef.typePatternGraph.getTypeId('@int');
         rel.patterns[0] = rootDef.typePatternGraph.addNewNode({pattern: '[]'}, {"vector-member": [rel.patterns[1]]});
         break;
       case "CONCAT":
-        rel.patterns[1] = rootDef.typePatternGraph.getTypeId('string');
+        rel.patterns[1] = rootDef.typePatternGraph.getTypeId('@string');
         rel.patterns[0] = rootDef.typePatternGraph.addNewNode({pattern: '[]'}, {"vector-member": [rel.patterns[1]]});
         break;
       case "toVEC":
-        rel.patterns[0] = rootDef.typePatternGraph.getTypeId('string')
+        rel.patterns[0] = rootDef.typePatternGraph.getTypeId('@string')
         rel.patterns[1] = rootDef.typePatternGraph.addNewNode({pattern: '[]'}, {"vector-member": [rel.patterns[0]]});
         break;
       case "toDateMsec":
         rel.patterns[0] = rootDef.typePatternGraph.addNewNode();
-        rel.patterns[1] = rootDef.typePatternGraph.getTypeId('int');
+        rel.patterns[1] = rootDef.typePatternGraph.getTypeId('@int');
         break;
       case "toJSON":
         rel.patterns[0] = rootDef.typePatternGraph.addNewNode();
-        rel.patterns[1] = rootDef.typePatternGraph.getTypeId('string');
+        rel.patterns[1] = rootDef.typePatternGraph.getTypeId('@string');
         break;
       case "toDateStr":
         rel.patterns[0] = rootDef.typePatternGraph.addNewNode();
-        rel.patterns[1] = rootDef.typePatternGraph.getTypeId('string');
+        rel.patterns[1] = rootDef.typePatternGraph.getTypeId('@string');
         break;
       case "GT":
       case "EQ":  
         rel.patterns[0] = rel.patterns[1] = rootDef.typePatternGraph.addNewNode({pattern: '[]'}, {"vector-member": [rootDef.typePatternGraph.addNewNode()]});
         break;
       case "fromJSON":
-        rel.patterns[0] = rootDef.typePatternGraph.getTypeId('string');
+        rel.patterns[0] = rootDef.typePatternGraph.getTypeId('@string');
         rel.patterns[1] = rootDef.typePatternGraph.addNewNode();
         break;
       case "CONS": {
@@ -405,7 +405,7 @@ function patterns(representatives, rels) {
           rel.patterns[1] = rootDef.typePatternGraph.addNewNode({pattern: '{}'}, {"car": [member], "cdr": [rel.patterns[0]]});
         }; break;
       case "DIV": {
-          const intId = rootDef.typePatternGraph.getTypeId('int');
+          const intId = rootDef.typePatternGraph.getTypeId('@int');
           rel.patterns[0] = rootDef.typePatternGraph.addNewNode({pattern: '[]'}, {"vector-member": [intId]});
           rel.patterns[1] = rootDef.typePatternGraph.addNewNode({pattern: '{}'}, {"div": [intId], "rem": [intId]});
         }; break;

package/run.mjs

@@ -68,9 +68,9 @@ const builtin = {
 };
 
 const codes = {
-  int: (x) => Number.isInteger(x),
-  string: (x) => x instanceof String || "string" === typeof x,
-  bool: (x) => x === true || x === false,
+  "@int": (x) => Number.isInteger(x),
+  "@string": (x) => x instanceof String || "string" === typeof x,
+  "@bool": (x) => x === true || x === false,
 };
 
 function verify(code, value) {

package/test-fingerprint.mjs

@@ -5,8 +5,8 @@ import hash from './hash.mjs';
     `
     $nat = < {} zero, nat succ>;
     $pair = {nat x, nat y};
-    $b = {int"x", bool y};
-    $vector = [int];
+    $b = {@int"x", @bool y};
+    $vector = [@int];
     $tree = <{nat value, tree left, tree right} binary, nat leaf, {nat value, tree tree} unary, [tree] list_of_trees>;
   
     succ = { $nat succ} $nat;

package/test.mjs

@@ -62,7 +62,7 @@ console.log("");
 });
 
 
-k_expression = "$ < < [ int ] ints, [ bool ] bools > list, string None>";
+k_expression = "$ < < [ @int ] ints, [ @bool ] bools > list, @string None>";
 
 k_fn = k.compile(k_expression);
 

package/tests.sh

@@ -0,0 +1,6 @@
+
+# This script is used to run the k.mjs interpreter with various test cases.
+
+echo "Running './tests.sh' ..."
+
+echo '[4,2,19,1]' | ./k.mjs -k Examples/rec-code.k -1

package/typing.mjs

@@ -401,14 +401,14 @@ class TypePatternGraph {
           case 'type': {
               const code = codes.find(p2.type);
               switch (code.code) {
-                case 'int':
+                case '@int':
                   // supports (2 .2) which returns unit
                   if (p1.fields.every(x => `${x}`.match(/^[0-9]+$/))) 
                     return p2;
                   break;
-                case 'string':
+                case '@string':
                   return p2;
-                case 'bool':
+                case '@bool':
                   if (p1.fields.every(x => `${x}`.match(/^true|false$/)))
                     return p2;
                   break;
@@ -471,14 +471,14 @@ class TypePatternGraph {
           case 'type':{
             const code = codes.find(p2.type);
             switch (code.code) {
-              case 'int':
+              case '@int':
                 // supports (2 .2) which returns unit
                 if (p1.fields.every(x => `${x}`.match(/^[0-9]+$/))) 
                   return p2;
                 break;
-              case 'string':
+              case '@string':
                 return p2;
-              case 'bool':
+              case '@bool':
                 if (p1.fields.every(x => `${x}`.match(/^true|false$/)))
                   return p2;
                 break;
@@ -508,13 +508,13 @@ class TypePatternGraph {
           case 'type':{
             const code = codes.find(p2.type);
             switch (code.code) {
-              case 'int':
+              case '@int':
                 if (p1.fields.every(x => `${x}`.match(/^[0-9]+$/))) 
                   return p2;
                 break;
-              case 'string':
+              case '@string':
                 return p2;
-              case 'bool':
+              case '@bool':
                 if (p1.fields.every(x => `${x}`.match(/^true|false$/)))
                   return p2;
                 break;
@@ -645,9 +645,9 @@ class TypePatternGraph {
     if (new_pattern.pattern == 'type') {
       const code = codes.find(new_pattern.type);
         switch (code.code) {
-          case 'int':
-          case 'string':
-          case 'bool': {
+          case '@int':
+          case '@string':
+          case '@bool': {
             // all edges are goin to unit type
             const unit_id = this.getTypeId(unitCode);
             for (const lab in this.edges[new_id]) {
@@ -667,7 +667,7 @@ class TypePatternGraph {
             const target_type_id = this.getTypeId(code.vector);
 
             this.edges[new_id] = {
-              'vector-member': asSet([ target_type_id, ...Object.values(this.edges[new_id])])
+              'vector-member': asSet([ target_type_id, ...[].concat(...Object.values(this.edges[new_id]))])
             }
           }
         }