@fraczak/k 7.2.0 → 8.0.0

package/parser.jison

@@ -49,9 +49,11 @@ function fromEscString(escString) {
 "<"                                            return 'LA';
 "{"                                            return 'LC';
 "("                                            return 'LP';
+"["                                            return 'LB';
 ">"                                            return 'RA';
 "}"                                            return 'RC';
 ")"                                            return 'RP';
+"]"                                            return 'RB';
 "="                                            return 'EQ'; 
 "..."                                          return 'DOTS';
 "."                                            return 'DOT';
@@ -71,7 +73,7 @@ function fromEscString(escString) {
 /lex
 
 %token NAME STRING
-%token LA LC LP RA RP RC EQ DOT COMMA SC COL AT QMARK DOTS DIV VID
+%token LA LC LP LB RA RC RP RB EQ DOT COMMA SC COL AT QMARK DOTS DIV VID
 %token INCREMENTAL
 %token EOF
 
@@ -85,9 +87,11 @@ at: AT                                  { $$ = getToken(yytext,yy,_$); };
 la: LA                                  { $$ = getToken(yytext,yy,_$); };
 lc: LC                                  { $$ = getToken(yytext,yy,_$); };
 lp: LP                                  { $$ = getToken(yytext,yy,_$); };
+lb: LB                                  { $$ = getToken(yytext,yy,_$); };
 ra: RA                                  { $$ = getToken(yytext,yy,_$); };
 rc: RC                                  { $$ = getToken(yytext,yy,_$); };
 rp: RP                                  { $$ = getToken(yytext,yy,_$); };
+rb: RB                                  { $$ = getToken(yytext,yy,_$); };
 eq: EQ                                  { $$ = getToken(yytext,yy,_$); };
 dots: DOTS                              { $$ = getToken(yytext,yy,_$); };
 dot: DOT                                { $$ = getToken(yytext,yy,_$); };
@@ -100,9 +104,14 @@ qmark: QMARK                            { $$ = getToken(yytext,yy,_$); };
 incremental: INCREMENTAL                { $$ = getToken(yytext,yy,_$); };
 
 input_with_eof: initialize_symbol_table defs comp EOF               {
-    const result = {defs: {rels: s.rels, codes: s.codes}, exp: $3};
-    // console.log(JSON.stringify(result, "", 2));
-    // process.exit(0);
+    const result = {
+        defs: {
+            rels: s.rels,
+            codes: s.codes,
+            patterns: s.patterns
+        },
+        exp: $3
+    };
     return result;
 };
 
@@ -113,17 +122,71 @@ initialize_symbol_table
 
 defs:                                   {  }
     | defs name eq comp sc              { s.add_rel($2.value,$4); }
+    | defs name lb pattern_params rb eq filter sc
+        {
+            const seen = new Set();
+            for (const p of $4) {
+                if (seen.has(p)) {
+                    const msg =
+                        `Duplicate parameter '${p}' ` +
+                        `in pattern '${$2.value}'.`;
+                    anError(@4, msg);
+                }
+                seen.add(p);
+            }
+            s.add_pattern($2.value, $4, $7);
+        }
+    ;
+
+pattern_params
+    : /* empty */                       { $$ = []; }
+    | non_empty_pattern_params          { $$ = $1; }
+    ;
+
+non_empty_pattern_params
+    : name                              { $$ = [$1.value]; }
+    | non_empty_pattern_params comma name
+                                        { $$ = [].concat($1, $3.value); }
     ;
 
 filter_
     : lp dots                 rp  { $$ = { type: null, open: true, fields: {}, start: $1.start, end: $3.end}; }
     | la labelled_filters      ra { $$ = { type: "union", open: $2.open, fields: $2.fields, start: $1.start, end: $3.end}; }
     | lc labelled_filters      rc { $$ = { type: "product", open: $2.open, fields: $2.fields, start: $1.start, end: $3.end}; }
+    | name lb pattern_args rb
+                                  {
+                                      $$ = {
+                                          type: "pattern_apply",
+                                          pattern: $1.value,
+                                          args: $3,
+                                          start: $1.start,
+                                          end: $4.end
+                                      };
+                                  }
+    ;
+
+pattern_args
+    : /* empty */                       { $$ = []; }
+    | non_empty_pattern_args            { $$ = $1; }
+    ;
+
+non_empty_pattern_args
+    : filter                            { $$ = [$1]; }
+    | non_empty_pattern_args comma filter
+                                        { $$ = [].concat($1, $3); }
     ;
 
 filter
     : filter_                      { $$ = $1; }
-    | filter_ EQ name              { $$ = { name: $3.value, ...$1, start: $1.start, end: $3.end }; }
+    | filter_ EQ name
+                                   {
+                                       $$ = {
+                                           ...$1,
+                                           name: $3.value,
+                                           start: $1.start,
+                                           end: $3.end
+                                       };
+                                   }
     | name                         { $$ = { type: 'name', name: $1.value, open: true, start: $1.start, end: $1.end}; }
     ;
 labelled_filters

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

package/pretty.mjs

@@ -49,6 +49,11 @@ function prettyFilter ( filter ) {
   } 
   switch (filter.type) {
     
+    case "pattern_apply": {
+      const argsStr = (filter.args || []).map(prettyFilter).join(", ");
+      const knot = filter.name ? `=${filter.name}` : "";
+      return `${filter.pattern}[${argsStr}]${knot}`;
+    }
     case "code":
       return `$${filter.code}`;
     case "name":