@fraczak/k 6.10.6 → 7.0.0

package/parser.mjs

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

package/pretty.mjs

@@ -131,14 +131,14 @@ function patterns2filters(typePatternGraph, ...patternIds) {
   const buildFilter = (path, patternId, i) => {
     let named_filter = {};
     const pattern = newTypePatternGraph.get_pattern(patternId);
-    if (variables[patternId] && pattern.pattern != 'type') {
+    if (variables[patternId]) {
       if (filterVars[patternId]) 
         return { type: 'name', name: filterVars[patternId] };
       filterVars[patternId] = `X${Object.keys(filterVars).length}`;
       named_filter = { name: filterVars[patternId] };
     }
     
-    const edges = newTypePatternGraph.edges[patternId];
+    const edges = newTypePatternGraph.edges[patternId] || {};
     const fields = () => 
       Object.keys(edges).sort().reduce( (fields, key) =>{
         fields[key] = buildFilter([...path, key], Object.values(edges[key])[0], i);
@@ -146,8 +146,15 @@ function patterns2filters(typePatternGraph, ...patternIds) {
       }, {});
 
     switch (pattern.pattern) {
-      case 'type':
-        return {type: "code", code: pattern.type, ...named_filter};
+      case 'type': {
+        const code = newTypePatternGraph.findCode(pattern.type);
+        if (code?.code === "product") {
+          return { type: 'product', fields: fields(), ...named_filter };
+        } else if (code?.code === "union") {
+          return { type: 'union', fields: fields(), ...named_filter };
+        }
+        return { type: "code", code: pattern.type, ...named_filter };
+      }
       case '(...)':
           return { type: null, open: true, fields: fields(), ...named_filter };
       case '{...}': 

package/repl.mjs

@@ -48,8 +48,8 @@ import {
 
 const NAME_RE = /^[a-zA-Z0-9_+-][a-zA-Z0-9_?!+-]*$/;
 const COMMAND_NAMES = [
-  "help", "type", "code", "rel", "C",
-  "types", "codecs", "rels", "codec", "input", "reset", "klib", "ko", "load",
+  "help", "rel",
+  "codecs", "rels", "codec", "input", "reset", "klib", "ko", "load",
   "engine", "wasm", "js",
   "quit", "exit"
 ];
@@ -115,14 +115,11 @@ function restoreCodes(state) {
 function aliasLine(kind, name, hash) {
   if (!NAME_RE.test(name)) return null;
   const body = hash.startsWith("@") ? hash.slice(1) : hash;
-  return kind === "code" ? `$ ${name} = @${body};` : `${name} = @${body};`;
+  return `${name} = @${body};`;
 }
 
 function aliasPreamble(state, omitName = null) {
   const lines = [];
-  for (const [name, hash] of Object.entries(state.typeAliases).sort()) {
-    if (name !== omitName) lines.push(aliasLine("code", name, hash));
-  }
   for (const [name, hash] of Object.entries(state.relAliases).sort()) {
     if (name !== omitName) lines.push(aliasLine("rel", name, hash));
   }
@@ -457,13 +454,6 @@ function canonicalNames(state) {
   ])].filter((name) => name.startsWith("@")).sort();
 }
 
-function canonicalCodeNames(state) {
-  return [...new Set([
-    ...Object.keys(state.codes),
-    ...Object.values(state.typeAliases)
-  ])].filter((name) => name.startsWith("@")).sort();
-}
-
 function aliasNames(state) {
   return [...new Set([
     ...Object.keys(state.typeAliases),
@@ -513,42 +503,16 @@ function completeCanonical(line, state) {
   return [matches, line];
 }
 
-function completeCanonicalCode(line, state) {
-  const match = line.match(/^(.*?)(@[A-Za-z0-9_?!+-]*)$/);
+function completeIdentifier(line, state) {
+  const match = line.match(/^(.*?)([A-Za-z0-9_+-][A-Za-z0-9_?!+-]*)$/);
   if (!match) return [[], line];
   const [, prefix, partial] = match;
-  const matches = canonicalCodeNames(state)
+  const matches = aliasNames(state)
     .filter((name) => name.startsWith(partial))
     .map((name) => `${prefix}${name}`);
   return [matches, line];
 }
 
-function completeIdentifier(line, state) {
-  const match = line.match(/^(.*?)(\$?[A-Za-z0-9_+-][A-Za-z0-9_?!+-]*)$/);
-  if (!match) return [[], line];
-  const [, prefix, partial] = match;
-  const isTypeToken = partial.startsWith("$");
-  const barePartial = isTypeToken ? partial.slice(1) : partial;
-  const names = isTypeToken ? Object.keys(state.typeAliases).sort() : aliasNames(state);
-  const matches = names
-    .filter((name) => name.startsWith(barePartial))
-    .map((name) => `${prefix}${isTypeToken ? "$" : ""}${name}`);
-  return [matches, line];
-}
-
-function completeTypeIdentifier(line, state) {
-  const match = line.match(/^(.*?)(\$?[A-Za-z0-9_+-][A-Za-z0-9_?!+-]*)$/);
-  if (!match) return [[], line];
-  const [, prefix, partial] = match;
-  const isTypeToken = partial.startsWith("$");
-  const barePartial = isTypeToken ? partial.slice(1) : partial;
-  const matches = Object.keys(state.typeAliases)
-    .sort()
-    .filter((name) => name.startsWith(barePartial))
-    .map((name) => `${prefix}${isTypeToken ? "$" : ""}${name}`);
-  return [matches, line];
-}
-
 function completePath(line, tokenStart) {
   const token = line.slice(tokenStart);
   const quote = token[0] === "\"" || token[0] === "'" ? token[0] : "";
@@ -825,7 +789,7 @@ function completeCommandArgument(line, state) {
     return completeCanonical(line, state);
   }
 
-  if (/\$?[A-Za-z0-9_+-][A-Za-z0-9_?!+-]*$/.test(line)) {
+  if (/[A-Za-z0-9_+-][A-Za-z0-9_?!+-]*$/.test(line)) {
     return completeIdentifier(line, state);
   }
 
@@ -839,7 +803,7 @@ function completeInput(line, state) {
   if (/@[A-Za-z0-9_?!+-]*$/.test(line)) {
     return completeCanonical(line, state);
   }
-  if (/\$?[A-Za-z0-9_+-][A-Za-z0-9_?!+-]*$/.test(line)) {
+  if (/[A-Za-z0-9_+-][A-Za-z0-9_?!+-]*$/.test(line)) {
     return completeIdentifier(line, state);
   }
   return [[], line];
@@ -1255,15 +1219,6 @@ async function evaluateCommand(line, state) {
       return [helpText()];
     case "timing":
       throw new Error(":timing has been removed; timing is now always enabled");
-    case "type": {
-      if (!arg) throw new Error(":type requires a type name");
-      if (arg.includes("=")) {
-        throw new Error("Type definitions use syntax: $ name = typeExpr; Use :type <name> to show a type definition");
-      }
-      return evaluateCommand(`:C ${arg}`, state);
-    }
-    case "code":
-      return evaluateCommand(`:C ${arg}`, state);
     case "def":
       throw new Error("Relation definitions use syntax: name = relExpr;");
     case "rel": {
@@ -1275,8 +1230,6 @@ async function evaluateCommand(line, state) {
       if (!rel) throw new Error(`Unknown relation '${arg}'`);
       return [`${arg} = ${prettyRelation(rel, displayAliases(state), state.relAliases)};  -- ${hash}`];
     }
-    case "types":
-      return [listAliases(state.typeAliases)];
     case "rels":
       return [listAliases(state.relAliases)];
     case "codec":
@@ -1330,12 +1283,6 @@ async function evaluateCommand(line, state) {
       loadSourceOrKlib(state, loadPath, { loadAliases });
       return [`loaded ${loadPath}`];
     }
-    case "C": {
-      if (!arg) throw new Error(`${usagePrefix}C requires a type name`);
-      const hash = state.typeAliases[arg] || (arg.startsWith("@") ? arg : null);
-      if (!hash || !(hash in state.codes)) throw new Error(`Unknown type '${arg}'`);
-      return [`$ ${arg} = ${prettyCode(displayAliases(state), codes.find, codes.find(hash))};  -- ${hash}`];
-    }
     default:
       throw new Error(`Unknown command ':${command}'. Try :help`);
   }
@@ -1345,8 +1292,6 @@ function helpText() {
   return [
     ":engine [wasm|js]    display or switch evaluation engine (wasm or js)",
     ":rel name            show relation definition",
-    ":type name           show type definition",
-    ":types               list type aliases",
     ":rels                list relation aliases",
     ":codec load file     load a codec module from file (e.g. :codec load codecs/int.mjs)",
     ":codec unload name   unload a registered codec",

package/scripts/build-repl-html.mjs

@@ -1666,12 +1666,10 @@ const htmlContent = `<!DOCTYPE html>
             </optgroup>
             <optgroup label="Quick Expressions">
               <option value="expr:{} | ok">{} | ok</option>
-              <option value="expr:()">()</option>
-              <option value="expr:$ bool = &lt; {} true, {} false &gt;; not = $ bool &lt; / true | false, {} | true &gt; $ bool; {} | true not">not (boolean relation with fallback)</option>
+              <option value="expr:not = &lt; / true | false, / false | true &gt;; {} | true not">not (boolean relation)</option>
               <option value="expr:1 succ">1 succ</option>
               <option value="expr:{10 int x, 5 int y} plus">{10 int x, 5 int y} plus (int)</option>
               <option value="expr:{10 int x, 5 int y} karatsuba">{10 int x, 5 int y} karatsuba</option>
-              <option value="expr::types">:types (list types)</option>
               <option value="expr::rels">:rels (list relations)</option>
               <option value="expr::engine">:engine (show engine)</option>
               <option value="expr::engine wasm">:engine wasm</option>
@@ -1803,10 +1801,10 @@ const htmlContent = `<!DOCTYPE html>
           <div class="help-section">
             <h4>Language Overview</h4>
             <p style="margin-bottom: 8px; color: var(--text-muted); line-height: 1.45;">
-              <b>k</b> is a concise language of <b>types</b> and <b>relations</b> (functions) over tree-like (JSON-like) documents. Every expression denotes a relation that transforms an input document into an output document.
+              <b>k</b> is a concise language of <b>relations</b> (functions) over tree-like (JSON-like) documents. Every expression denotes a relation that transforms an input document into an output document.
             </p>
             <p style="margin-bottom: 10px; color: var(--text-muted); line-height: 1.45;">
-              <b>Content-Addressed:</b> Functions and types are identified by their canonical content hash (<code>@...</code>) derived directly from their structure. Local names are just temporary aliases used for recursion and readability.
+              <b>Content-Addressed:</b> Relations are identified by their canonical content hash (<code>@...</code>) derived directly from their structure. Local names are just temporary aliases used for recursion and readability.
             </p>
 
             <div class="help-category-title">1. Definitions (Local Aliases)</div>
@@ -1820,36 +1818,10 @@ const htmlContent = `<!DOCTYPE html>
                   <td><code>name = relExpr;</code></td>
                   <td><b>Relation Alias:</b> Defines a local alias for a relation expression.<br><i>e.g.</i> <code>swap = { . y x, . x y };</code></td>
                 </tr>
-                <tr>
-                  <td><code>$ name = typeExpr;</code></td>
-                  <td><b>Type Alias:</b> Defines a local alias for a type schema.<br><i>e.g.</i> <code>$ bool = &lt; {} true, {} false &gt;;</code></td>
-                </tr>
-              </tbody>
-            </table>
-
-            <div class="help-category-title">2. Type Expressions (<code>typeExpr</code>)</div>
-            <p style="margin-bottom: 6px; color: var(--text-muted); font-size: 12px;">Schemas describing tree-like documents:</p>
-            <table class="help-table">
-              <thead>
-                <tr><th style="width: 45%;">Syntax</th><th>Description</th></tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td><code>{ Type_1 label_1, ..., Type_k label_k }</code></td>
-                  <td><b>Product Type:</b> Labeled record of arity <i>k</i> (e.g. <code>{float64 x, string n}</code>; special case: <code>{}</code> is the 0-ary product)</td>
-                </tr>
-                <tr>
-                  <td><code>&lt; Type_1 tag_1, ..., Type_k tag_k &gt;</code></td>
-                  <td><b>Union Type:</b> Tagged sum of <i>k</i> variants (e.g. <code>&lt;int ok, string err&gt;</code>)</td>
-                </tr>
-                <tr>
-                  <td><code>name</code> / <code>@hash</code></td>
-                  <td><b>Type Reference:</b> References a type by local alias or canonical content hash</td>
-                </tr>
               </tbody>
             </table>
 
-            <div class="help-category-title">3. Relation Expressions (<code>relExpr</code>)</div>
+            <div class="help-category-title">2. Relation Expressions (<code>relExpr</code>)</div>
             <p style="margin-bottom: 6px; color: var(--text-muted); font-size: 12px;">Functions transforming an input document to an output document:</p>
             <table class="help-table">
               <thead>
@@ -1881,8 +1853,8 @@ const htmlContent = `<!DOCTYPE html>
                   <td><b>Variant Constructor:</b> Wraps document into variant <code>tag</code></td>
                 </tr>
                 <tr>
-                  <td><code>$ typeExpr</code></td>
-                  <td><b>Type Constraint:</b> Asserts input matches <code>typeExpr</code> (compile-time Type Error on mismatch)</td>
+                  <td><code>? filterExpr</code></td>
+                  <td><b>Pattern Filter:</b> Asserts input matches pattern; acts as partial identity and inductive termination witness (<i>e.g.</i> <code>?&lt; {} true, {} false &gt;</code>)</td>
                 </tr>
                 <tr>
                   <td><code>name</code> / <code>@hash</code></td>
@@ -1898,8 +1870,6 @@ const htmlContent = `<!DOCTYPE html>
               <tr><td><code>:engine [wasm|js]</code></td><td>Display or switch evaluation engine (<code>wasm</code> or <code>js</code>)</td></tr>
               <tr><td><code>:load &lt;file&gt;</code></td><td>Load a <code>.k</code> source or <code>.klib</code> library into current state</td></tr>
               <tr><td><code>:rel &lt;name&gt;</code></td><td>Display definition of relation <code>&lt;name&gt;</code></td></tr>
-              <tr><td><code>:type &lt;name&gt;</code></td><td>Display definition of type <code>&lt;name&gt;</code></td></tr>
-              <tr><td><code>:types</code></td><td>List all type aliases and canonical hashes</td></tr>
               <tr><td><code>:rels</code></td><td>List all relation aliases</td></tr>
               <tr><td><code>:codecs</code></td><td>List all loaded format codecs</td></tr>
               <tr><td><code>:codec load &lt;file.mjs&gt;</code></td><td>Load a codec from file (or load through Files)</td></tr>
@@ -1918,8 +1888,8 @@ const htmlContent = `<!DOCTYPE html>
               <li><code>{} | ok</code> &mdash; Constant relation producing variant <code>ok</code> with empty document payload <code>{}</code></li>
               <li><code>not = &lt; / true | false, / false | true &gt;;</code> &mdash; Polymorphic negation via branch projections and ordered choice</li>
               <li><code>{} | true not</code> &mdash; Compose constant relation <code>{} | true</code> with <code>not</code> (evaluates to <code>{} | false</code>)</li>
-              <li><code>$ bool = &lt; {} true, {} false &gt;;</code> &mdash; Define a boolean union type schema</li>
-              <li><code>not = $ bool &lt; / true | false, {} | true &gt; $ bool;</code> &mdash; Typed boolean negation: guarded by <code>$ bool</code>, defaulting to <code>{} | true</code></li>
+              <li><code>bool = ?&lt; {} true, {} false &gt;;</code> &mdash; Define a boolean pattern filter relation</li>
+              <li><code>not = bool ?X &lt; / true | false, {} | true &gt; ?X;</code> &mdash; Filtered boolean negation: guarded by <code>bool</code>, defaulting to <code>{} | true</code></li>
               <li><code>swap = { . y x, . x y };</code> &mdash; Define a product field-swapping relation</li>
               <li><code>{ {} | ok x, {} | nil y } swap</code> &mdash; Construct a product and pass it through <code>swap</code></li>
             </ul>

package/tests/code-derivation/blowup.mjs

@@ -19,9 +19,7 @@ t(`
 `, (annotated) => {
     // console.log(JSON.stringify(annotated,null,2));
     const {input,output} = in_out(annotated);
-    console.log(input);
-    console.log(output);
-    assert.equal(output.type, annotated.representatives["bnat"]);
-    assert.equal(input.type, annotated.representatives["pair"]);
+    assert.equal(output.pattern, '(...)');
+    assert.equal(input.pattern, '<...>');
     console.log("OK");
 });

package/tests/code-derivation/bnat.mjs

@@ -5,8 +5,7 @@ import assert from 'assert';
 t(fs.readFileSync("./Examples/bnat.k", "utf8"), (annotated) => {
     // console.log(JSON.stringify(annotated,null,2));
     const {input,output} = in_out(annotated);
-    // console.log(output);
-    assert.equal(output.type, annotated.representatives["bnat"]);
-    assert.equal(input.type, annotated.representatives["pair"]);
+    assert.equal(output.type, "@VtPHxGf5GNMzzyVFxtv7gegFfJRYapBGtCeyV56bs5Zb");
+    assert.equal(input.type, "@R7RD2sgu6yPqpCQBBcJqkzxHQMZfEJLcNW4UKBcTiC3m");
     console.log("OK");
 });