velocityjs - npm Package Compare versions

Comparing version 0.10.1 to 1.0.0

History.md

@@ -0,1 +1,5 @@
+## 1.0.0 2018-01-13
+
+- feat: support macro bodyContext [!97](https://github.com/shepherdwind/velocity.js/pull/97)
+
 ## 0.10.1 2017-11-10
@@ -2,0 +6,0 @@

package.json

 {
   "name": "velocityjs",
   "description": "Velocity Template Language(VTL) for JavaScript",
-  "version": "0.10.1",
+  "version": "1.0.0",
   "license": "MIT",
@@ -21,3 +21,3 @@ "keywords": [
   },
-  "broswer": {
+  "browser": {
     "fs": false
@@ -24,0 +24,0 @@ },

src/compile/blocks.js

@@ -32,2 +32,5 @@ 'use strict';
           break;
+        case 'macro_body':
+          ret = this.getMacroBody(block);
+          break;
         default:
@@ -65,6 +68,13 @@ ret = this._render(block);
 
+    getMacroBody: function(asts) {
+      const ast = asts[0];
+      var _block = asts.slice(1);
+      var bodyContent = this.eval(_block, {});
+      return this.getMacro(ast, bodyContent);
+    },
+
     /**
      * parse macro call
      */
-    getMacro: function(ast) {
+    getMacro: function(ast, bodyContent) {
       var macro = this.macros[ast.id];
@@ -111,3 +121,3 @@ var ret = '';
         var callArgs = ast.args;
-        var local = {};
+        var local = { bodyContent: bodyContent };
         var guid = utils.guid();
@@ -114,0 +124,0 @@ var contextId = 'macro:' + ast.id + ':' + guid;

src/parse.js

@@ -11,3 +11,4 @@ 'use strict';
   noescape: true,
-  define: true
+  define: true,
+  macro_body: true,
 };
@@ -14,0 +15,0 @@

src/parse/index.js

@@ -75,8 +75,8 @@ /* parser generated by jison 0.4.18 */
 var velocity = (function(){
-var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,8],$V1=[1,9],$V2=[1,19],$V3=[1,10],$V4=[1,23],$V5=[1,22],$V6=[4,10,11,20,34,35,80],$V7=[1,27],$V8=[1,31],$V9=[1,30],$Va=[4,10,11,20,23,34,35,38,47,48,49,52,53,54,55,56,57,58,59,60,61,62,63,64,80,82,92],$Vb=[1,47],$Vc=[1,52],$Vd=[1,53],$Ve=[1,68],$Vf=[1,67],$Vg=[1,80],$Vh=[1,75],$Vi=[1,83],$Vj=[1,91],$Vk=[1,81],$Vl=[1,86],$Vm=[1,90],$Vn=[1,87],$Vo=[1,88],$Vp=[4,10,11,20,23,34,35,38,47,48,49,52,53,54,55,56,57,58,59,60,61,62,63,64,73,78,80,81,82,92],$Vq=[1,117],$Vr=[1,113],$Vs=[1,114],$Vt=[1,125],$Vu=[23,48,82],$Vv=[2,93],$Vw=[23,38,47,48,82],$Vx=[23,38,47,48,52,53,54,55,56,57,58,59,60,61,62,63,64,80,82],$Vy=[23,38,47,48,52,53,54,55,56,57,58,59,60,61,62,63,64,80,82,94],$Vz=[2,106],$VA=[23,38,47,48,52,53,54,55,56,57,58,59,60,61,62,63,64,80,82,92],$VB=[2,109],$VC=[1,134],$VD=[1,140],$VE=[23,47,48],$VF=[1,145],$VG=[1,146],$VH=[1,147],$VI=[1,148],$VJ=[1,149],$VK=[1,150],$VL=[1,151],$VM=[1,152],$VN=[1,153],$VO=[1,154],$VP=[1,155],$VQ=[1,156],$VR=[1,157],$VS=[23,52,53,54,55,56,57,58,59,60,61,62,63,64],$VT=[48,82],$VU=[2,110],$VV=[23,34],$VW=[1,206],$VX=[1,205],$VY=[38,48],$VZ=[23,52,53],$V_=[23,52,53,54,55,59,60,61,62,63,64],$V$=[23,52,53,59,60,61,62,63,64];
+var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,8],$V1=[1,9],$V2=[1,19],$V3=[1,10],$V4=[1,24],$V5=[1,25],$V6=[1,23],$V7=[4,10,11,20,35,36,46,82],$V8=[1,29],$V9=[1,33],$Va=[1,32],$Vb=[4,10,11,20,23,35,36,39,46,49,50,51,54,55,56,57,58,59,60,61,62,63,64,65,66,82,84,94],$Vc=[1,50],$Vd=[1,55],$Ve=[1,56],$Vf=[1,72],$Vg=[1,71],$Vh=[1,84],$Vi=[1,79],$Vj=[1,87],$Vk=[1,95],$Vl=[1,85],$Vm=[1,90],$Vn=[1,94],$Vo=[1,91],$Vp=[1,92],$Vq=[4,10,11,20,23,35,36,39,46,49,50,51,54,55,56,57,58,59,60,61,62,63,64,65,66,75,80,82,83,84,94],$Vr=[1,107],$Vs=[1,121],$Vt=[1,117],$Vu=[1,118],$Vv=[1,131],$Vw=[23,50,84],$Vx=[2,96],$Vy=[23,39,49,50,84],$Vz=[23,39,49,50,54,55,56,57,58,59,60,61,62,63,64,65,66,82,84],$VA=[23,39,49,50,54,55,56,57,58,59,60,61,62,63,64,65,66,82,84,96],$VB=[2,109],$VC=[23,39,49,50,54,55,56,57,58,59,60,61,62,63,64,65,66,82,84,94],$VD=[2,112],$VE=[1,140],$VF=[1,146],$VG=[23,49,50],$VH=[1,151],$VI=[1,152],$VJ=[1,153],$VK=[1,154],$VL=[1,155],$VM=[1,156],$VN=[1,157],$VO=[1,158],$VP=[1,159],$VQ=[1,160],$VR=[1,161],$VS=[1,162],$VT=[1,163],$VU=[23,54,55,56,57,58,59,60,61,62,63,64,65,66],$VV=[50,84],$VW=[2,113],$VX=[23,35],$VY=[1,213],$VZ=[1,212],$V_=[39,50],$V$=[23,54,55],$V01=[23,54,55,56,57,61,62,63,64,65,66],$V11=[23,54,55,61,62,63,64,65,66];
 var parser = {trace: function trace() { },
 yy: {},
-symbols_: {"error":2,"root":3,"EOF":4,"statements":5,"statement":6,"references":7,"directives":8,"content":9,"RAW":10,"COMMENT":11,"set":12,"if":13,"elseif":14,"else":15,"end":16,"foreach":17,"break":18,"define":19,"HASH":20,"NOESCAPE":21,"PARENTHESIS":22,"CLOSE_PARENTHESIS":23,"macro":24,"macro_call":25,"SET":26,"equal":27,"IF":28,"expression":29,"ELSEIF":30,"ELSE":31,"END":32,"FOREACH":33,"DOLLAR":34,"ID":35,"IN":36,"MAP_BEGIN":37,"MAP_END":38,"array":39,"BREAK":40,"DEFINE":41,"MACRO":42,"macro_args":43,"macro_call_args_all":44,"macro_call_args":45,"literals":46,"SPACE":47,"COMMA":48,"EQUAL":49,"map":50,"math":51,"||":52,"&&":53,"+":54,"-":55,"*":56,"/":57,"%":58,">":59,"<":60,"==":61,">=":62,"<=":63,"!=":64,"parenthesis":65,"!":66,"literal":67,"brace_begin":68,"attributes":69,"brace_end":70,"methodbd":71,"VAR_BEGIN":72,"VAR_END":73,"attribute":74,"method":75,"index":76,"property":77,"DOT":78,"params":79,"CONTENT":80,"BRACKET":81,"CLOSE_BRACKET":82,"string":83,"number":84,"BOOL":85,"integer":86,"INTEGER":87,"DECIMAL_POINT":88,"STRING":89,"EVAL_STRING":90,"range":91,"RANGE":92,"map_item":93,"MAP_SPLIT":94,"$accept":0,"$end":1},
-terminals_: {2:"error",4:"EOF",10:"RAW",11:"COMMENT",20:"HASH",21:"NOESCAPE",22:"PARENTHESIS",23:"CLOSE_PARENTHESIS",26:"SET",28:"IF",30:"ELSEIF",31:"ELSE",32:"END",33:"FOREACH",34:"DOLLAR",35:"ID",36:"IN",37:"MAP_BEGIN",38:"MAP_END",40:"BREAK",41:"DEFINE",42:"MACRO",47:"SPACE",48:"COMMA",49:"EQUAL",52:"||",53:"&&",54:"+",55:"-",56:"*",57:"/",58:"%",59:">",60:"<",61:"==",62:">=",63:"<=",64:"!=",66:"!",72:"VAR_BEGIN",73:"VAR_END",78:"DOT",80:"CONTENT",81:"BRACKET",82:"CLOSE_BRACKET",85:"BOOL",87:"INTEGER",88:"DECIMAL_POINT",89:"STRING",90:"EVAL_STRING",92:"RANGE",94:"MAP_SPLIT"},
-productions_: [0,[3,1],[3,2],[5,1],[5,2],[6,1],[6,1],[6,1],[6,1],[6,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,4],[8,1],[8,1],[12,5],[13,5],[14,5],[15,2],[16,2],[17,8],[17,10],[17,8],[17,10],[18,2],[19,6],[24,6],[24,5],[43,1],[43,2],[25,5],[25,4],[45,1],[45,1],[45,3],[45,3],[45,3],[45,3],[44,1],[44,2],[44,3],[44,2],[27,3],[29,1],[29,1],[29,1],[51,3],[51,3],[51,3],[51,3],[51,3],[51,3],[51,3],[51,3],[51,3],[51,3],[51,3],[51,3],[51,3],[51,1],[51,2],[51,2],[51,1],[51,1],[65,3],[7,5],[7,3],[7,5],[7,3],[7,2],[7,4],[7,2],[7,4],[68,1],[68,1],[70,1],[70,1],[69,1],[69,2],[74,1],[74,1],[74,1],[75,2],[71,4],[71,3],[79,1],[79,1],[79,1],[79,3],[79,3],[77,2],[77,2],[76,3],[76,3],[76,3],[76,2],[76,2],[67,1],[67,1],[67,1],[84,1],[84,3],[84,4],[86,1],[86,2],[83,1],[83,1],[46,1],[46,1],[46,1],[39,3],[39,1],[39,2],[91,5],[91,5],[91,5],[91,5],[50,3],[50,2],[93,3],[93,3],[93,2],[93,5],[93,5],[9,1],[9,1],[9,2],[9,3],[9,3],[9,2]],
+symbols_: {"error":2,"root":3,"EOF":4,"statements":5,"statement":6,"references":7,"directives":8,"content":9,"RAW":10,"COMMENT":11,"set":12,"if":13,"elseif":14,"else":15,"end":16,"foreach":17,"break":18,"define":19,"HASH":20,"NOESCAPE":21,"PARENTHESIS":22,"CLOSE_PARENTHESIS":23,"macro":24,"macro_call":25,"macro_body":26,"SET":27,"equal":28,"IF":29,"expression":30,"ELSEIF":31,"ELSE":32,"END":33,"FOREACH":34,"DOLLAR":35,"ID":36,"IN":37,"MAP_BEGIN":38,"MAP_END":39,"array":40,"BREAK":41,"DEFINE":42,"MACRO":43,"macro_args":44,"macro_call_args_all":45,"MACRO_BODY":46,"macro_call_args":47,"literals":48,"SPACE":49,"COMMA":50,"EQUAL":51,"map":52,"math":53,"||":54,"&&":55,"+":56,"-":57,"*":58,"/":59,"%":60,">":61,"<":62,"==":63,">=":64,"<=":65,"!=":66,"parenthesis":67,"!":68,"literal":69,"brace_begin":70,"attributes":71,"brace_end":72,"methodbd":73,"VAR_BEGIN":74,"VAR_END":75,"attribute":76,"method":77,"index":78,"property":79,"DOT":80,"params":81,"CONTENT":82,"BRACKET":83,"CLOSE_BRACKET":84,"string":85,"number":86,"BOOL":87,"integer":88,"INTEGER":89,"DECIMAL_POINT":90,"STRING":91,"EVAL_STRING":92,"range":93,"RANGE":94,"map_item":95,"MAP_SPLIT":96,"$accept":0,"$end":1},
+terminals_: {2:"error",4:"EOF",10:"RAW",11:"COMMENT",20:"HASH",21:"NOESCAPE",22:"PARENTHESIS",23:"CLOSE_PARENTHESIS",27:"SET",29:"IF",31:"ELSEIF",32:"ELSE",33:"END",34:"FOREACH",35:"DOLLAR",36:"ID",37:"IN",38:"MAP_BEGIN",39:"MAP_END",41:"BREAK",42:"DEFINE",43:"MACRO",46:"MACRO_BODY",49:"SPACE",50:"COMMA",51:"EQUAL",54:"||",55:"&&",56:"+",57:"-",58:"*",59:"/",60:"%",61:">",62:"<",63:"==",64:">=",65:"<=",66:"!=",68:"!",74:"VAR_BEGIN",75:"VAR_END",80:"DOT",82:"CONTENT",83:"BRACKET",84:"CLOSE_BRACKET",87:"BOOL",89:"INTEGER",90:"DECIMAL_POINT",91:"STRING",92:"EVAL_STRING",94:"RANGE",96:"MAP_SPLIT"},
+productions_: [0,[3,1],[3,2],[5,1],[5,2],[6,1],[6,1],[6,1],[6,1],[6,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,4],[8,1],[8,1],[8,1],[12,5],[13,5],[14,5],[15,2],[16,2],[17,8],[17,10],[17,8],[17,10],[18,2],[19,6],[24,6],[24,5],[44,1],[44,2],[25,5],[25,4],[26,5],[26,4],[47,1],[47,1],[47,3],[47,3],[47,3],[47,3],[45,1],[45,2],[45,3],[45,2],[28,3],[30,1],[30,1],[30,1],[53,3],[53,3],[53,3],[53,3],[53,3],[53,3],[53,3],[53,3],[53,3],[53,3],[53,3],[53,3],[53,3],[53,1],[53,2],[53,2],[53,1],[53,1],[67,3],[7,5],[7,3],[7,5],[7,3],[7,2],[7,4],[7,2],[7,4],[70,1],[70,1],[72,1],[72,1],[71,1],[71,2],[76,1],[76,1],[76,1],[77,2],[73,4],[73,3],[81,1],[81,1],[81,1],[81,3],[81,3],[79,2],[79,2],[78,3],[78,3],[78,3],[78,2],[78,2],[69,1],[69,1],[69,1],[86,1],[86,3],[86,4],[88,1],[88,2],[85,1],[85,1],[48,1],[48,1],[48,1],[40,3],[40,1],[40,2],[93,5],[93,5],[93,5],[93,5],[52,3],[52,2],[95,3],[95,3],[95,2],[95,5],[95,5],[9,1],[9,1],[9,2],[9,3],[9,3],[9,2]],
 performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
@@ -93,6 +93,6 @@ /* this == yyval */
 break;
-case 3: case 34: case 38: case 39: case 83: case 91: case 93:
+case 3: case 35: case 41: case 42: case 86: case 94: case 96:
  this.$ = [$$[$0]]; 
 break;
-case 4: case 35: case 84:
+case 4: case 36: case 87:
  this.$ = [].concat($$[$0-1], $$[$0]); 
@@ -106,3 +106,3 @@ break;
 break;
-case 7: case 10: case 11: case 12: case 13: case 14: case 15: case 16: case 17: case 19: case 20: case 44: case 45: case 49: case 50: case 51: case 65: case 68: case 69: case 79: case 80: case 81: case 82: case 88: case 96: case 103: case 104: case 109: case 115: case 117: case 130: case 131:
+case 7: case 10: case 11: case 12: case 13: case 14: case 15: case 16: case 17: case 19: case 20: case 21: case 47: case 48: case 52: case 53: case 54: case 68: case 71: case 72: case 82: case 83: case 84: case 85: case 91: case 99: case 106: case 107: case 112: case 118: case 120: case 133: case 134:
  this.$ = $$[$0]; 
@@ -119,192 +119,198 @@ break;
 break;
-case 21:
+case 22:
  this.$ = {type: 'set', equal: $$[$0-1] }; 
 break;
-case 22:
+case 23:
  this.$ = {type: 'if', condition: $$[$0-1] }; 
 break;
-case 23:
+case 24:
  this.$ = {type: 'elseif', condition: $$[$0-1] }; 
 break;
-case 24:
+case 25:
  this.$ = {type: 'else' }; 
 break;
-case 25:
+case 26:
  this.$ = {type: 'end' }; 
 break;
-case 26: case 28:
+case 27: case 29:
  this.$ = {type: 'foreach', to: $$[$0-3], from: $$[$0-1] }; 
 break;
-case 27: case 29:
+case 28: case 30:
  this.$ = {type: 'foreach', to: $$[$0-4], from: $$[$0-1] }; 
 break;
-case 30:
+case 31:
  this.$ = {type: $$[$0] }; 
 break;
-case 31:
+case 32:
  this.$ = {type: 'define', id: $$[$0-1] }; 
 break;
-case 32:
+case 33:
  this.$ = {type: 'macro', id: $$[$0-2], args: $$[$0-1] }; 
 break;
-case 33:
+case 34:
  this.$ = {type: 'macro', id: $$[$0-1] }; 
 break;
-case 36:
+case 37:
  this.$ = { type:"macro_call", id: $$[$0-3].replace(/^\s+|\s+$/g, ''), args: $$[$0-1] }; 
 break;
-case 37:
+case 38:
  this.$ = { type:"macro_call", id: $$[$0-2].replace(/^\s+|\s+$/g, '') }; 
 break;
-case 40: case 41: case 42: case 43: case 94: case 95:
+case 39:
+ this.$ = {type: 'macro_body', id: $$[$0-3], args: $$[$0-1] }; 
+break;
+case 40:
+ this.$ = {type: 'macro_body', id: $$[$0-2] }; 
+break;
+case 43: case 44: case 45: case 46: case 97: case 98:
  this.$ = [].concat($$[$0-2], $$[$0]); 
 break;
-case 46: case 47: case 98: case 99:
+case 49: case 50: case 101: case 102:
  this.$ = $$[$0-1]; 
 break;
-case 48:
+case 51:
  this.$ = [$$[$0-2], $$[$0]]; 
 break;
-case 52:
+case 55:
  this.$ = {type: 'math', expression: [$$[$0-2], $$[$0]], operator: '||' }; 
 break;
-case 53:
+case 56:
  this.$ = {type: 'math', expression: [$$[$0-2], $$[$0]], operator: '&&' }; 
 break;
-case 54: case 55: case 56: case 57: case 58:
+case 57: case 58: case 59: case 60: case 61:
  this.$ = {type: 'math', expression: [$$[$0-2], $$[$0]], operator: $$[$0-1] }; 
 break;
-case 59:
+case 62:
  this.$ = {type: 'math', expression: [$$[$0-2], $$[$0]], operator: '>' }; 
 break;
-case 60:
+case 63:
  this.$ = {type: 'math', expression: [$$[$0-2], $$[$0]], operator: '<' }; 
 break;
-case 61:
+case 64:
  this.$ = {type: 'math', expression: [$$[$0-2], $$[$0]], operator: '==' }; 
 break;
-case 62:
+case 65:
  this.$ = {type: 'math', expression: [$$[$0-2], $$[$0]], operator: '>=' }; 
 break;
-case 63:
+case 66:
  this.$ = {type: 'math', expression: [$$[$0-2], $$[$0]], operator: '<=' }; 
 break;
-case 64:
+case 67:
  this.$ = {type: 'math', expression: [$$[$0-2], $$[$0]], operator: '!=' }; 
 break;
-case 66:
+case 69:
  this.$ = {type: 'math', expression: [$$[$0]], operator: 'minus' }; 
 break;
-case 67:
+case 70:
  this.$ = {type: 'math', expression: [$$[$0]], operator: 'not' }; 
 break;
-case 70:
+case 73:
  this.$ = {type: 'math', expression: [$$[$0-1]], operator: 'parenthesis' }; 
 break;
-case 71:
+case 74:
  this.$ = {type: "references", id: $$[$0-2], path: $$[$0-1], isWraped: true, leader: $$[$0-4] }; 
 break;
-case 72:
+case 75:
  this.$ = {type: "references", id: $$[$0-1], path: $$[$0], leader: $$[$0-2] }; 
 break;
-case 73:
+case 76:
  this.$ = {type: "references", id: $$[$0-2].id, path: $$[$0-1], isWraped: true, leader: $$[$0-4], args: $$[$0-2].args }; 
 break;
-case 74:
+case 77:
  this.$ = {type: "references", id: $$[$0-1].id, path: $$[$0], leader: $$[$0-2], args: $$[$0-1].args }; 
 break;
-case 75:
+case 78:
  this.$ = {type: "references", id: $$[$0], leader: $$[$0-1] }; 
 break;
-case 76:
+case 79:
  this.$ = {type: "references", id: $$[$0-1], isWraped: true, leader: $$[$0-3] }; 
 break;
-case 77:
+case 80:
  this.$ = {type: "references", id: $$[$0].id, leader: $$[$0-1], args: $$[$0].args }; 
 break;
-case 78:
+case 81:
  this.$ = {type: "references", id: $$[$0-1].id, isWraped: true, args: $$[$0-1].args, leader: $$[$0-3] }; 
 break;
-case 85:
+case 88:
  this.$ = {type:"method", id: $$[$0].id, args: $$[$0].args }; 
 break;
-case 86:
+case 89:
  this.$ = {type: "index", id: $$[$0] }; 
 break;
-case 87:
+case 90:
  this.$ = {type: "property", id: $$[$0] }; if ($$[$0].type === 'content') this.$ = $$[$0]; 
 break;
-case 89:
+case 92:
  this.$ = {id: $$[$0-3], args: $$[$0-1] }; 
 break;
-case 90:
+case 93:
  this.$ = {id: $$[$0-2], args: false }; 
 break;
-case 92:
+case 95:
  this.$ = [ { type: 'runt', value: $$[$0] } ]; 
 break;
-case 97:
+case 100:
  this.$ = {type: 'content', value: $$[$0-1] + $$[$0] }; 
 break;
-case 100:
+case 103:
  this.$ = {type: "content", value: $$[$0-2] + $$[$0-1].value + $$[$0] }; 
 break;
-case 101: case 102:
+case 104: case 105:
  this.$ = {type: "content", value: $$[$0-1] + $$[$0] }; 
 break;
-case 105:
+case 108:
  this.$ = {type: 'bool', value: $$[$0] }; 
 break;
-case 106:
+case 109:
  this.$ = {type: "integer", value: $$[$0]}; 
 break;
-case 107:
+case 110:
  this.$ = {type: "decimal", value: + ($$[$0-2] + '.' + $$[$0]) }; 
 break;
-case 108:
+case 111:
  this.$ = {type: "decimal", value: - ($$[$0-2] + '.' + $$[$0]) }; 
 break;
-case 110:
+case 113:
  this.$ = - parseInt($$[$0], 10); 
 break;
-case 111:
+case 114:
  this.$ = {type: 'string', value: $$[$0] }; 
 break;
-case 112:
+case 115:
  this.$ = {type: 'string', value: $$[$0], isEval: true }; 
 break;
-case 113: case 114:
+case 116: case 117:
  this.$ = $$[$0];
 break;
-case 116:
+case 119:
  this.$ = {type: 'array', value: $$[$0-1] }; 
 break;
-case 118:
+case 121:
  this.$ = {type: 'array', value: [] }; 
 break;
-case 119: case 120: case 121: case 122:
+case 122: case 123: case 124: case 125:
  this.$ = {type: 'array', isRange: true, value: [$$[$0-3], $$[$0-1]]}; 
 break;
-case 123:
+case 126:
  this.$ = {type: 'map', value: $$[$0-1] }; 
 break;
-case 124:
+case 127:
  this.$ = {type: 'map'}; 
 break;
-case 125: case 126:
+case 128: case 129:
  this.$ = {}; this.$[$$[$0-2].value] = $$[$0]; 
 break;
-case 127:
+case 130:
  this.$ = {}; this.$[$$[$0-1].value] = $$[$01]; 
 break;
-case 128: case 129:
+case 131: case 132:
  this.$ = $$[$0-4]; this.$[$$[$0-2].value] = $$[$0]; 
 break;
-case 132: case 135:
+case 135: case 138:
  this.$ = $$[$0-1] + $$[$0]; 
 break;
-case 133:
+case 136:
  this.$ = $$[$0-2] + $$[$0-1] + $$[$0]; 
 break;
-case 134:
+case 137:
  this.$ = $$[$0-2] + $$[$0-1]; 
@@ -314,4 +320,4 @@ break;
 },
-table: [{3:1,4:[1,2],5:3,6:4,7:5,8:6,9:7,10:$V0,11:$V1,12:11,13:12,14:13,15:14,16:15,17:16,18:17,19:18,20:$V2,24:20,25:21,34:$V3,35:$V4,80:$V5},{1:[3]},{1:[2,1]},{4:[1,24],6:25,7:5,8:6,9:7,10:$V0,11:$V1,12:11,13:12,14:13,15:14,16:15,17:16,18:17,19:18,20:$V2,24:20,25:21,34:$V3,35:$V4,80:$V5},o($V6,[2,3]),o($V6,[2,5]),o($V6,[2,6]),o($V6,[2,7]),o($V6,[2,8]),o($V6,[2,9]),{35:$V7,37:$V8,68:26,71:28,72:$V9,80:[1,29]},o($V6,[2,10]),o($V6,[2,11]),o($V6,[2,12]),o($V6,[2,13]),o($V6,[2,14]),o($V6,[2,15]),o($V6,[2,16]),o($V6,[2,17]),{21:[1,32],26:[1,35],28:[1,36],30:[1,37],31:[1,38],32:[1,39],33:[1,40],35:[1,34],40:[1,41],41:[1,42],42:[1,43],80:[1,33]},o($V6,[2,19]),o($V6,[2,20]),o($V6,[2,130]),o($V6,[2,131]),{1:[2,2]},o($V6,[2,4]),{35:[1,44],71:45},o($Va,[2,75],{69:46,74:48,75:49,76:50,77:51,22:$Vb,78:$Vc,81:$Vd}),o($Va,[2,77],{74:48,75:49,76:50,77:51,69:54,78:$Vc,81:$Vd}),o($V6,[2,135]),{35:[2,79]},{35:[2,80]},{22:[1,55]},o($V6,[2,132]),{4:[1,57],22:[1,58],80:[1,56]},{22:[1,59]},{22:[1,60]},{22:[1,61]},o($V6,[2,24]),o($V6,[2,25]),{22:[1,62]},o($V6,[2,30]),{22:[1,63]},{22:[1,64]},{22:$Vb,38:$Ve,69:65,70:66,73:$Vf,74:48,75:49,76:50,77:51,78:$Vc,81:$Vd},{38:$Ve,69:69,70:70,73:$Vf,74:48,75:49,76:50,77:51,78:$Vc,81:$Vd},o($Va,[2,72],{75:49,76:50,77:51,74:71,78:$Vc,81:$Vd}),{7:76,23:[1,73],34:$Vg,35:$Vh,37:$Vi,39:77,46:74,50:78,55:$Vj,67:79,79:72,81:$Vk,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo,91:82},o($Vp,[2,83]),o($Vp,[2,85]),o($Vp,[2,86]),o($Vp,[2,87]),{35:[1,93],71:92,80:[1,94]},{7:96,34:$Vg,55:$Vj,67:95,80:[1,97],82:[1,98],83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},o($Va,[2,74],{75:49,76:50,77:51,74:71,78:$Vc,81:$Vd}),{23:[1,99]},o($V6,[2,133]),o($V6,[2,134]),{7:105,23:[1,101],34:$Vg,37:$Vi,39:77,44:100,45:102,46:104,47:[1,103],50:78,55:$Vj,67:79,81:$Vk,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo,91:82},{7:107,27:106,34:$Vg},{7:115,22:$Vq,29:108,34:$Vg,37:$Vi,39:109,50:110,51:111,55:$Vr,65:112,66:$Vs,67:116,81:$Vk,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo,91:82},{7:115,22:$Vq,29:118,34:$Vg,37:$Vi,39:109,50:110,51:111,55:$Vr,65:112,66:$Vs,67:116,81:$Vk,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo,91:82},{34:[1,119]},{34:[1,120]},{35:[1,121]},{38:$Ve,70:122,73:$Vf,74:71,75:49,76:50,77:51,78:$Vc,81:$Vd},o($Va,[2,76]),o($Va,[2,81]),o($Va,[2,82]),{38:$Ve,70:123,73:$Vf,74:71,75:49,76:50,77:51,78:$Vc,81:$Vd},o($Va,[2,78]),o($Vp,[2,84]),{23:[1,124],48:$Vt},o($Vp,[2,90]),o($Vu,[2,91]),o($Vu,[2,92]),o([23,48],$Vv),o($Vw,[2,113]),o($Vw,[2,114]),o($Vw,[2,115]),{35:$V7,37:$V8,68:26,71:28,72:$V9},{7:129,34:$Vg,35:$Vh,37:$Vi,39:77,46:74,50:78,55:$Vj,67:79,79:126,81:$Vk,82:[1,127],83:84,84:85,85:$Vl,86:128,87:$Vm,89:$Vn,90:$Vo,91:82},o($Vw,[2,117]),{38:[1,131],83:132,89:$Vn,90:$Vo,93:130},o($Vx,[2,103]),o($Vx,[2,104]),o($Vx,[2,105]),o($Vy,[2,111]),o($Vy,[2,112]),o($Vx,$Vz),o($VA,$VB,{88:[1,133]}),{87:$VC},o($Vp,[2,88]),o($Vp,[2,96],{22:$Vb}),o($Vp,[2,97]),{80:[1,136],82:[1,135]},{82:[1,137]},o($Vp,[2,101]),o($Vp,[2,102]),o($V6,[2,18]),{23:[1,138]},o($V6,[2,37]),{23:[2,44],47:[1,139],48:$VD},{7:105,34:$Vg,37:$Vi,39:77,45:141,46:104,50:78,55:$Vj,67:79,81:$Vk,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo,91:82},o($VE,[2,38]),o($VE,[2,39]),{23:[1,142]},{49:[1,143]},{23:[1,144]},{23:[2,49]},{23:[2,50]},{23:[2,51],52:$VF,53:$VG,54:$VH,55:$VI,56:$VJ,57:$VK,58:$VL,59:$VM,60:$VN,61:$VO,62:$VP,63:$VQ,64:$VR},o($VS,[2,65]),{22:$Vq,65:158,87:$VC},{7:115,22:$Vq,34:$Vg,51:159,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},o($VS,[2,68]),o($VS,[2,69]),{7:115,22:$Vq,34:$Vg,51:160,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},{23:[1,161]},{35:[1,162],37:[1,163]},{35:[1,164]},{7:167,23:[1,166],34:$Vg,43:165},o($Va,[2,71]),o($Va,[2,73]),o($Vp,[2,89]),{7:169,34:$Vg,37:$Vi,39:77,46:168,50:78,55:$Vj,67:79,81:$Vk,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo,91:82},{48:$Vt,82:[1,170]},o($Vw,[2,118]),o($VT,$Vz,{92:[1,171]}),o($VT,$Vv,{92:[1,172]}),{38:[1,173],48:[1,174]},o($Vw,[2,124]),{94:[1,175]},{87:[1,176]},o($VA,$VU,{88:[1,177]}),o($Vp,[2,98]),o($Vp,[2,100]),o($Vp,[2,99]),o($V6,[2,36]),{7:179,23:[2,47],34:$Vg,37:$Vi,39:77,46:178,50:78,55:$Vj,67:79,81:$Vk,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo,91:82},{7:181,34:$Vg,37:$Vi,39:77,46:180,50:78,55:$Vj,67:79,81:$Vk,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo,91:82},{23:[2,45],47:[1,182],48:$VD},o($V6,[2,21]),{7:115,22:$Vq,29:183,34:$Vg,37:$Vi,39:109,50:110,51:111,55:$Vr,65:112,66:$Vs,67:116,81:$Vk,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo,91:82},o($V6,[2,22]),{7:115,22:$Vq,34:$Vg,51:184,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},{7:115,22:$Vq,34:$Vg,51:185,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},{7:115,22:$Vq,34:$Vg,51:186,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},{7:115,22:$Vq,34:$Vg,51:187,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},{7:115,22:$Vq,34:$Vg,51:188,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},{7:115,22:$Vq,34:$Vg,51:189,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},{7:115,22:$Vq,34:$Vg,51:190,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},{7:115,22:$Vq,34:$Vg,51:191,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},{7:115,22:$Vq,34:$Vg,51:192,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},{7:115,22:$Vq,34:$Vg,51:193,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},{7:115,22:$Vq,34:$Vg,51:194,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},{7:115,22:$Vq,34:$Vg,51:195,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},{7:115,22:$Vq,34:$Vg,51:196,55:$Vr,65:112,66:$Vs,67:116,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo},o($VS,[2,66]),o($VS,[2,67]),{23:[1,197],52:$VF,53:$VG,54:$VH,55:$VI,56:$VJ,57:$VK,58:$VL,59:$VM,60:$VN,61:$VO,62:$VP,63:$VQ,64:$VR},o($V6,[2,23]),{36:[1,198]},{35:[1,199]},{23:[1,200]},{7:202,23:[1,201],34:$Vg},o($V6,[2,33]),o($VV,[2,34]),o($Vu,[2,94]),o($Vu,[2,95]),o($Vw,[2,116]),{7:204,34:$Vg,55:$VW,86:203,87:$VX},{7:208,34:$Vg,55:$VW,86:207,87:$VX},o($Vw,[2,123]),{83:209,89:$Vn,90:$Vo},o($VY,[2,127],{39:77,50:78,67:79,91:82,83:84,84:85,86:89,46:210,7:211,34:$Vg,37:$Vi,55:$Vj,81:$Vk,85:$Vl,87:$Vm,89:$Vn,90:$Vo}),o($Vx,[2,107]),{87:[1,212]},o($VE,[2,40]),o($VE,[2,43]),o($VE,[2,41]),o($VE,[2,42]),{7:179,23:[2,46],34:$Vg,37:$Vi,39:77,46:178,50:78,55:$Vj,67:79,81:$Vk,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo,91:82},{23:[2,48]},o($VZ,[2,52],{54:$VH,55:$VI,56:$VJ,57:$VK,58:$VL,59:$VM,60:$VN,61:$VO,62:$VP,63:$VQ,64:$VR}),o($VZ,[2,53],{54:$VH,55:$VI,56:$VJ,57:$VK,58:$VL,59:$VM,60:$VN,61:$VO,62:$VP,63:$VQ,64:$VR}),o($V_,[2,54],{56:$VJ,57:$VK,58:$VL}),o($V_,[2,55],{56:$VJ,57:$VK,58:$VL}),o($VS,[2,56]),o($VS,[2,57]),o($VS,[2,58]),o($V$,[2,59],{54:$VH,55:$VI,56:$VJ,57:$VK,58:$VL}),o($V$,[2,60],{54:$VH,55:$VI,56:$VJ,57:$VK,58:$VL}),o($V$,[2,61],{54:$VH,55:$VI,56:$VJ,57:$VK,58:$VL}),o($V$,[2,62],{54:$VH,55:$VI,56:$VJ,57:$VK,58:$VL}),o($V$,[2,63],{54:$VH,55:$VI,56:$VJ,57:$VK,58:$VL}),o($V$,[2,64],{54:$VH,55:$VI,56:$VJ,57:$VK,58:$VL}),o($VS,[2,70]),{7:213,34:$Vg,39:214,81:$Vk,91:82},{38:[1,215]},o($V6,[2,31]),o($V6,[2,32]),o($VV,[2,35]),{82:[1,216]},{82:[1,217]},{82:$VB},{87:[1,218]},{82:[1,219]},{82:[1,220]},{94:[1,221]},o($VY,[2,125]),o($VY,[2,126]),o($Vx,[2,108]),{23:[1,222]},{23:[1,223]},{36:[1,224]},o($Vw,[2,119]),o($Vw,[2,121]),{82:$VU},o($Vw,[2,120]),o($Vw,[2,122]),{7:225,34:$Vg,37:$Vi,39:77,46:226,50:78,55:$Vj,67:79,81:$Vk,83:84,84:85,85:$Vl,86:89,87:$Vm,89:$Vn,90:$Vo,91:82},o($V6,[2,26]),o($V6,[2,28]),{7:227,34:$Vg,39:228,81:$Vk,91:82},o($VY,[2,128]),o($VY,[2,129]),{23:[1,229]},{23:[1,230]},o($V6,[2,27]),o($V6,[2,29])],
-defaultActions: {2:[2,1],24:[2,2],30:[2,79],31:[2,80],109:[2,49],110:[2,50],183:[2,48],205:[2,109],218:[2,110]},
+table: [{3:1,4:[1,2],5:3,6:4,7:5,8:6,9:7,10:$V0,11:$V1,12:11,13:12,14:13,15:14,16:15,17:16,18:17,19:18,20:$V2,24:20,25:21,26:22,35:$V3,36:$V4,46:$V5,82:$V6},{1:[3]},{1:[2,1]},{4:[1,26],6:27,7:5,8:6,9:7,10:$V0,11:$V1,12:11,13:12,14:13,15:14,16:15,17:16,18:17,19:18,20:$V2,24:20,25:21,26:22,35:$V3,36:$V4,46:$V5,82:$V6},o($V7,[2,3]),o($V7,[2,5]),o($V7,[2,6]),o($V7,[2,7]),o($V7,[2,8]),o($V7,[2,9]),{36:$V8,38:$V9,70:28,73:30,74:$Va,82:[1,31]},o($V7,[2,10]),o($V7,[2,11]),o($V7,[2,12]),o($V7,[2,13]),o($V7,[2,14]),o($V7,[2,15]),o($V7,[2,16]),o($V7,[2,17]),{21:[1,34],27:[1,37],29:[1,38],31:[1,39],32:[1,40],33:[1,41],34:[1,42],36:[1,36],41:[1,43],42:[1,44],43:[1,45],82:[1,35]},o($V7,[2,19]),o($V7,[2,20]),o($V7,[2,21]),o($V7,[2,133]),o($V7,[2,134]),{36:[1,46]},{1:[2,2]},o($V7,[2,4]),{36:[1,47],73:48},o($Vb,[2,78],{71:49,76:51,77:52,78:53,79:54,22:$Vc,80:$Vd,83:$Ve}),o($Vb,[2,80],{76:51,77:52,78:53,79:54,71:57,80:$Vd,83:$Ve}),o($V7,[2,138]),{36:[2,82]},{36:[2,83]},{22:[1,58]},o($V7,[2,135]),{4:[1,60],22:[1,61],82:[1,59]},{22:[1,62]},{22:[1,63]},{22:[1,64]},o($V7,[2,25]),o($V7,[2,26]),{22:[1,65]},o($V7,[2,31]),{22:[1,66]},{22:[1,67]},{22:[1,68]},{22:$Vc,39:$Vf,71:69,72:70,75:$Vg,76:51,77:52,78:53,79:54,80:$Vd,83:$Ve},{39:$Vf,71:73,72:74,75:$Vg,76:51,77:52,78:53,79:54,80:$Vd,83:$Ve},o($Vb,[2,75],{77:52,78:53,79:54,76:75,80:$Vd,83:$Ve}),{7:80,23:[1,77],35:$Vh,36:$Vi,38:$Vj,40:81,48:78,52:82,57:$Vk,69:83,81:76,83:$Vl,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp,93:86},o($Vq,[2,86]),o($Vq,[2,88]),o($Vq,[2,89]),o($Vq,[2,90]),{36:[1,97],73:96,82:[1,98]},{7:100,35:$Vh,57:$Vk,69:99,82:[1,101],84:[1,102],85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},o($Vb,[2,77],{77:52,78:53,79:54,76:75,80:$Vd,83:$Ve}),{23:[1,103]},o($V7,[2,136]),o($V7,[2,137]),{7:109,23:[1,105],35:$Vh,38:$Vj,40:81,45:104,47:106,48:108,49:$Vr,52:82,57:$Vk,69:83,83:$Vl,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp,93:86},{7:111,28:110,35:$Vh},{7:119,22:$Vs,30:112,35:$Vh,38:$Vj,40:113,52:114,53:115,57:$Vt,67:116,68:$Vu,69:120,83:$Vl,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp,93:86},{7:119,22:$Vs,30:122,35:$Vh,38:$Vj,40:113,52:114,53:115,57:$Vt,67:116,68:$Vu,69:120,83:$Vl,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp,93:86},{35:[1,123]},{35:[1,124]},{36:[1,125]},{7:109,23:[1,127],35:$Vh,38:$Vj,40:81,45:126,47:106,48:108,49:$Vr,52:82,57:$Vk,69:83,83:$Vl,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp,93:86},{39:$Vf,72:128,75:$Vg,76:75,77:52,78:53,79:54,80:$Vd,83:$Ve},o($Vb,[2,79]),o($Vb,[2,84]),o($Vb,[2,85]),{39:$Vf,72:129,75:$Vg,76:75,77:52,78:53,79:54,80:$Vd,83:$Ve},o($Vb,[2,81]),o($Vq,[2,87]),{23:[1,130],50:$Vv},o($Vq,[2,93]),o($Vw,[2,94]),o($Vw,[2,95]),o([23,50],$Vx),o($Vy,[2,116]),o($Vy,[2,117]),o($Vy,[2,118]),{36:$V8,38:$V9,70:28,73:30,74:$Va},{7:135,35:$Vh,36:$Vi,38:$Vj,40:81,48:78,52:82,57:$Vk,69:83,81:132,83:$Vl,84:[1,133],85:88,86:89,87:$Vm,88:134,89:$Vn,91:$Vo,92:$Vp,93:86},o($Vy,[2,120]),{39:[1,137],85:138,91:$Vo,92:$Vp,95:136},o($Vz,[2,106]),o($Vz,[2,107]),o($Vz,[2,108]),o($VA,[2,114]),o($VA,[2,115]),o($Vz,$VB),o($VC,$VD,{90:[1,139]}),{89:$VE},o($Vq,[2,91]),o($Vq,[2,99],{22:$Vc}),o($Vq,[2,100]),{82:[1,142],84:[1,141]},{84:[1,143]},o($Vq,[2,104]),o($Vq,[2,105]),o($V7,[2,18]),{23:[1,144]},o($V7,[2,38]),{23:[2,47],49:[1,145],50:$VF},{7:109,35:$Vh,38:$Vj,40:81,47:147,48:108,52:82,57:$Vk,69:83,83:$Vl,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp,93:86},o($VG,[2,41]),o($VG,[2,42]),{23:[1,148]},{51:[1,149]},{23:[1,150]},{23:[2,52]},{23:[2,53]},{23:[2,54],54:$VH,55:$VI,56:$VJ,57:$VK,58:$VL,59:$VM,60:$VN,61:$VO,62:$VP,63:$VQ,64:$VR,65:$VS,66:$VT},o($VU,[2,68]),{22:$Vs,67:164,89:$VE},{7:119,22:$Vs,35:$Vh,53:165,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},o($VU,[2,71]),o($VU,[2,72]),{7:119,22:$Vs,35:$Vh,53:166,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},{23:[1,167]},{36:[1,168],38:[1,169]},{36:[1,170]},{7:173,23:[1,172],35:$Vh,44:171},{23:[1,174]},o($V7,[2,40]),o($Vb,[2,74]),o($Vb,[2,76]),o($Vq,[2,92]),{7:176,35:$Vh,38:$Vj,40:81,48:175,52:82,57:$Vk,69:83,83:$Vl,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp,93:86},{50:$Vv,84:[1,177]},o($Vy,[2,121]),o($VV,$VB,{94:[1,178]}),o($VV,$Vx,{94:[1,179]}),{39:[1,180],50:[1,181]},o($Vy,[2,127]),{96:[1,182]},{89:[1,183]},o($VC,$VW,{90:[1,184]}),o($Vq,[2,101]),o($Vq,[2,103]),o($Vq,[2,102]),o($V7,[2,37]),{7:186,23:[2,50],35:$Vh,38:$Vj,40:81,48:185,52:82,57:$Vk,69:83,83:$Vl,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp,93:86},{7:188,35:$Vh,38:$Vj,40:81,48:187,52:82,57:$Vk,69:83,83:$Vl,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp,93:86},{23:[2,48],49:[1,189],50:$VF},o($V7,[2,22]),{7:119,22:$Vs,30:190,35:$Vh,38:$Vj,40:113,52:114,53:115,57:$Vt,67:116,68:$Vu,69:120,83:$Vl,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp,93:86},o($V7,[2,23]),{7:119,22:$Vs,35:$Vh,53:191,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},{7:119,22:$Vs,35:$Vh,53:192,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},{7:119,22:$Vs,35:$Vh,53:193,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},{7:119,22:$Vs,35:$Vh,53:194,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},{7:119,22:$Vs,35:$Vh,53:195,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},{7:119,22:$Vs,35:$Vh,53:196,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},{7:119,22:$Vs,35:$Vh,53:197,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},{7:119,22:$Vs,35:$Vh,53:198,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},{7:119,22:$Vs,35:$Vh,53:199,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},{7:119,22:$Vs,35:$Vh,53:200,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},{7:119,22:$Vs,35:$Vh,53:201,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},{7:119,22:$Vs,35:$Vh,53:202,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},{7:119,22:$Vs,35:$Vh,53:203,57:$Vt,67:116,68:$Vu,69:120,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp},o($VU,[2,69]),o($VU,[2,70]),{23:[1,204],54:$VH,55:$VI,56:$VJ,57:$VK,58:$VL,59:$VM,60:$VN,61:$VO,62:$VP,63:$VQ,64:$VR,65:$VS,66:$VT},o($V7,[2,24]),{37:[1,205]},{36:[1,206]},{23:[1,207]},{7:209,23:[1,208],35:$Vh},o($V7,[2,34]),o($VX,[2,35]),o($V7,[2,39]),o($Vw,[2,97]),o($Vw,[2,98]),o($Vy,[2,119]),{7:211,35:$Vh,57:$VY,88:210,89:$VZ},{7:215,35:$Vh,57:$VY,88:214,89:$VZ},o($Vy,[2,126]),{85:216,91:$Vo,92:$Vp},o($V_,[2,130],{40:81,52:82,69:83,93:86,85:88,86:89,88:93,48:217,7:218,35:$Vh,38:$Vj,57:$Vk,83:$Vl,87:$Vm,89:$Vn,91:$Vo,92:$Vp}),o($Vz,[2,110]),{89:[1,219]},o($VG,[2,43]),o($VG,[2,46]),o($VG,[2,44]),o($VG,[2,45]),{7:186,23:[2,49],35:$Vh,38:$Vj,40:81,48:185,52:82,57:$Vk,69:83,83:$Vl,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp,93:86},{23:[2,51]},o($V$,[2,55],{56:$VJ,57:$VK,58:$VL,59:$VM,60:$VN,61:$VO,62:$VP,63:$VQ,64:$VR,65:$VS,66:$VT}),o($V$,[2,56],{56:$VJ,57:$VK,58:$VL,59:$VM,60:$VN,61:$VO,62:$VP,63:$VQ,64:$VR,65:$VS,66:$VT}),o($V01,[2,57],{58:$VL,59:$VM,60:$VN}),o($V01,[2,58],{58:$VL,59:$VM,60:$VN}),o($VU,[2,59]),o($VU,[2,60]),o($VU,[2,61]),o($V11,[2,62],{56:$VJ,57:$VK,58:$VL,59:$VM,60:$VN}),o($V11,[2,63],{56:$VJ,57:$VK,58:$VL,59:$VM,60:$VN}),o($V11,[2,64],{56:$VJ,57:$VK,58:$VL,59:$VM,60:$VN}),o($V11,[2,65],{56:$VJ,57:$VK,58:$VL,59:$VM,60:$VN}),o($V11,[2,66],{56:$VJ,57:$VK,58:$VL,59:$VM,60:$VN}),o($V11,[2,67],{56:$VJ,57:$VK,58:$VL,59:$VM,60:$VN}),o($VU,[2,73]),{7:220,35:$Vh,40:221,83:$Vl,93:86},{39:[1,222]},o($V7,[2,32]),o($V7,[2,33]),o($VX,[2,36]),{84:[1,223]},{84:[1,224]},{84:$VD},{89:[1,225]},{84:[1,226]},{84:[1,227]},{96:[1,228]},o($V_,[2,128]),o($V_,[2,129]),o($Vz,[2,111]),{23:[1,229]},{23:[1,230]},{37:[1,231]},o($Vy,[2,122]),o($Vy,[2,124]),{84:$VW},o($Vy,[2,123]),o($Vy,[2,125]),{7:232,35:$Vh,38:$Vj,40:81,48:233,52:82,57:$Vk,69:83,83:$Vl,85:88,86:89,87:$Vm,88:93,89:$Vn,91:$Vo,92:$Vp,93:86},o($V7,[2,27]),o($V7,[2,29]),{7:234,35:$Vh,40:235,83:$Vl,93:86},o($V_,[2,131]),o($V_,[2,132]),{23:[1,236]},{23:[1,237]},o($V7,[2,28]),o($V7,[2,30])],
+defaultActions: {2:[2,1],26:[2,2],32:[2,82],33:[2,83],113:[2,52],114:[2,53],190:[2,51],212:[2,112],225:[2,113]},
 parseError: function parseError(str, hash) {
@@ -803,3 +809,3 @@ if (hash.recoverable) {
                                     if (_num > 1) yy_.yytext = yy_.yytext.replace(/(\\\\)+$/, '\\');
-                                    if(yy_.yytext) return 80;
+                                    if(yy_.yytext) return 82;
                                   
@@ -818,6 +824,6 @@ break;
                                     if (_num > 1) yy_.yytext = yy_.yytext.replace(/(\\\\)+$/, '\\');
-                                    if(yy_.yytext) return 80;
+                                    if(yy_.yytext) return 82;
                                   
 break;
-case 2: return 80; 
+case 2: return 82; 
 break;
@@ -830,94 +836,96 @@ case 3: this.popState(); return 11;
 break;
-case 6: return 20; 
+case 6: return 46; 
 break;
-case 7: return 26; 
+case 7: return 20; 
 break;
-case 8: return 28; 
+case 8: return 27; 
 break;
-case 9: return 30; 
+case 9: return 29; 
 break;
-case 10: this.popState(); return 31; 
+case 10: return 31; 
 break;
-case 11: this.popState(); return 31; 
+case 11: this.popState(); return 32; 
 break;
 case 12: this.popState(); return 32; 
 break;
-case 13: this.popState(); return 32; 
+case 13: this.popState(); return 33; 
 break;
-case 14: this.popState(); return 40; 
+case 14: this.popState(); return 33; 
 break;
-case 15: return 33; 
+case 15: this.popState(); return 41; 
 break;
-case 16: return 21; 
+case 16: return 34; 
 break;
-case 17: return 41; 
+case 17: return 21; 
 break;
 case 18: return 42; 
 break;
-case 19: return 36; 
+case 19: return 43; 
 break;
-case 20: return yy_.yytext; 
+case 20: return 37; 
 break;
 case 21: return yy_.yytext; 
 break;
-case 22: return 63; 
+case 22: return yy_.yytext; 
 break;
-case 23: return yy_.yytext; 
+case 23: return 65; 
 break;
-case 24: return 62; 
+case 24: return yy_.yytext; 
 break;
-case 25: return yy_.yytext; 
+case 25: return 64; 
 break;
-case 26: return 59; 
+case 26: return yy_.yytext; 
 break;
-case 27: return 60; 
+case 27: return 61; 
 break;
-case 28: return yy_.yytext; 
+case 28: return 62; 
 break;
-case 29: return 61; 
+case 29: return yy_.yytext; 
 break;
-case 30: return yy_.yytext; 
+case 30: return 63; 
 break;
-case 31: return 52; 
+case 31: return yy_.yytext; 
 break;
-case 32: return yy_.yytext; 
+case 32: return 54; 
 break;
-case 33: return 53; 
+case 33: return yy_.yytext; 
 break;
-case 34: return yy_.yytext; 
+case 34: return 55; 
 break;
-case 35: return 64; 
+case 35: return yy_.yytext; 
 break;
 case 36: return 66; 
 break;
-case 37: return 34; 
+case 37: return 68; 
 break;
-case 38: return 34; 
+case 38: return 35; 
 break;
-case 39: return yy_.yytext; 
+case 39: return 35; 
 break;
-case 40: return 49; 
+case 40: return yy_.yytext; 
 break;
-case 41:
+case 41: return 51; 
+break;
+case 42:
                                     var len = this.stateStackSize();
                                     if (len >= 2 && this.topState() === 'c' && this.topState(1) === 'run') {
-                                      return 47;
+                                      return 49;
                                     }
                                   
 break;
-case 42: /*ignore whitespace*/ 
+case 43: /*ignore whitespace*/ 
 break;
-case 43: return 37; 
-break;
 case 44: return 38; 
 break;
-case 45: return 94; 
+case 45: return 39; 
 break;
-case 46: yy.begin = true; return 72; 
+case 46: return 96; 
 break;
-case 47: this.popState(); if (yy.begin === true) { yy.begin = false; return 73;} else { return 80; } 
+case 47: yy.begin = true; return 74; 
 break;
-case 48: this.begin("c"); return 22; 
+case 48: this.popState(); if (yy.begin === true) { yy.begin = false; return 75;} else { return 82; } 
 break;
-case 49:
+case 49: this.begin("c"); return 22; 
+break;
+case 50:
                                     if (this.popState() === "c") {
@@ -943,56 +951,56 @@ var len = this.stateStackSize();
                                     } else {
-                                      return 80; 
+                                      return 82; 
                                     }
                                   
 break;
-case 50: this.begin("i"); return 81; 
+case 51: this.begin("i"); return 83; 
 break;
-case 51: 
+case 52: 
                                     if (this.popState() === "i") {
-                                      return 82; 
+                                      return 84; 
                                     } else {
-                                      return 80;
+                                      return 82;
                                     }
                                   
 break;
-case 52: return 92; 
+case 53: return 94; 
 break;
-case 53: return 78; 
+case 54: return 80; 
 break;
-case 54: return 88; 
+case 55: return 90; 
 break;
-case 55: return 48; 
+case 56: return 50; 
 break;
-case 56: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2).replace(/\\"/g,'"'); return 90; 
+case 57: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2).replace(/\\"/g,'"'); return 92; 
 break;
-case 57: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2).replace(/\\'/g,"'"); return 89; 
+case 58: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2).replace(/\\'/g,"'"); return 91; 
 break;
-case 58: return 85; 
+case 59: return 87; 
 break;
-case 59: return 85; 
+case 60: return 87; 
 break;
-case 60: return 85; 
-break;
 case 61: return 87; 
 break;
-case 62: return 35; 
+case 62: return 89; 
 break;
-case 63: this.begin("run"); return 35; 
+case 63: return 36; 
 break;
-case 64: this.begin('h'); return 20; 
+case 64: this.begin("run"); return 36; 
 break;
-case 65: this.popState(); return 80; 
+case 65: this.begin('h'); return 20; 
 break;
-case 66: this.popState(); return 80; 
+case 66: this.popState(); return 82; 
 break;
-case 67: this.popState(); return 80; 
+case 67: this.popState(); return 82; 
 break;
-case 68: this.popState(); return 4; 
+case 68: this.popState(); return 82; 
 break;
-case 69: return 4; 
+case 69: this.popState(); return 4; 
 break;
+case 70: return 4; 
+break;
 }
 },
-rules: [/^(?:[^#]*?(?=\$))/,/^(?:[^\$]*?(?=#))/,/^(?:[^\x00]+)/,/^(?:#\*[\s\S]+?\*#)/,/^(?:#\[\[[\s\S]+?\]\]#)/,/^(?:##[^\n]*)/,/^(?:#(?=[a-zA-Z{]))/,/^(?:set[ ]*(?=[^a-zA-Z0-9_]+))/,/^(?:if[ ]*(?=[^a-zA-Z0-9_]+))/,/^(?:elseif[ ]*(?=[^a-zA-Z0-9_]+))/,/^(?:else\b)/,/^(?:\{else\})/,/^(?:end\b)/,/^(?:\{end\})/,/^(?:break\b)/,/^(?:foreach[ ]*(?=[^a-zA-Z0-9_]+))/,/^(?:noescape(?=[^a-zA-Z0-9_]+))/,/^(?:define[ ]*(?=[^a-zA-Z0-9_]+))/,/^(?:macro[ ]*(?=[^a-zA-Z0-9_]+))/,/^(?:in\b)/,/^(?:[%\+\-\*\/])/,/^(?:<=)/,/^(?:le\b)/,/^(?:>=)/,/^(?:ge\b)/,/^(?:[><])/,/^(?:gt\b)/,/^(?:lt\b)/,/^(?:==)/,/^(?:eq\b)/,/^(?:\|\|)/,/^(?:or\b)/,/^(?:&&)/,/^(?:and\b)/,/^(?:!=)/,/^(?:ne\b)/,/^(?:not\b)/,/^(?:\$!(?=[{a-zA-Z_]))/,/^(?:\$(?=[{a-zA-Z_]))/,/^(?:!)/,/^(?:=)/,/^(?:[ ]+(?=[^,]))/,/^(?:\s+)/,/^(?:\{)/,/^(?:\})/,/^(?::[\s]*)/,/^(?:\{)/,/^(?:\})/,/^(?:\([\s]*(?=[$'"\[\{\-0-9\w()!]))/,/^(?:\))/,/^(?:\[[\s]*(?=[\-$"'0-9{\[\]]+))/,/^(?:\])/,/^(?:\.\.)/,/^(?:\.(?=[a-zA-Z_]))/,/^(?:\.(?=[\d]))/,/^(?:,[ ]*)/,/^(?:"(\\"|[^\"])*")/,/^(?:'(\\'|[^\'])*')/,/^(?:null\b)/,/^(?:false\b)/,/^(?:true\b)/,/^(?:[0-9]+)/,/^(?:[_a-zA-Z][a-zA-Z0-9_\-]*)/,/^(?:[_a-zA-Z][a-zA-Z0-9_\-]*[ ]*(?=\())/,/^(?:#)/,/^(?:.)/,/^(?:\s+)/,/^(?:[\$#])/,/^(?:$)/,/^(?:$)/],
-conditions: {"mu":{"rules":[5,37,38,46,47,48,49,50,51,53,62,64,65,66,68],"inclusive":false},"c":{"rules":[19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,48,49,50,51,53,54,55,56,57,58,59,60,61,62],"inclusive":false},"i":{"rules":[19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,42,43,43,44,44,45,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62],"inclusive":false},"h":{"rules":[3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,37,38,39,40,45,48,49,50,51,53,61,63,65,66,68],"inclusive":false},"esc":{"rules":[67],"inclusive":false},"run":{"rules":[37,38,39,41,42,43,44,45,48,49,50,51,53,54,55,56,57,58,59,60,61,62,65,66,68],"inclusive":false},"INITIAL":{"rules":[0,1,2,69],"inclusive":true}}
+rules: [/^(?:[^#]*?(?=\$))/,/^(?:[^\$]*?(?=#))/,/^(?:[^\x00]+)/,/^(?:#\*[\s\S]+?\*#)/,/^(?:#\[\[[\s\S]+?\]\]#)/,/^(?:##[^\n]*)/,/^(?:#@)/,/^(?:#(?=[a-zA-Z{]))/,/^(?:set[ ]*(?=[^a-zA-Z0-9_]+))/,/^(?:if[ ]*(?=[^a-zA-Z0-9_]+))/,/^(?:elseif[ ]*(?=[^a-zA-Z0-9_]+))/,/^(?:else\b)/,/^(?:\{else\})/,/^(?:end\b)/,/^(?:\{end\})/,/^(?:break\b)/,/^(?:foreach[ ]*(?=[^a-zA-Z0-9_]+))/,/^(?:noescape(?=[^a-zA-Z0-9_]+))/,/^(?:define[ ]*(?=[^a-zA-Z0-9_]+))/,/^(?:macro[ ]*(?=[^a-zA-Z0-9_]+))/,/^(?:in\b)/,/^(?:[%\+\-\*\/])/,/^(?:<=)/,/^(?:le\b)/,/^(?:>=)/,/^(?:ge\b)/,/^(?:[><])/,/^(?:gt\b)/,/^(?:lt\b)/,/^(?:==)/,/^(?:eq\b)/,/^(?:\|\|)/,/^(?:or\b)/,/^(?:&&)/,/^(?:and\b)/,/^(?:!=)/,/^(?:ne\b)/,/^(?:not\b)/,/^(?:\$!(?=[{a-zA-Z_]))/,/^(?:\$(?=[{a-zA-Z_]))/,/^(?:!)/,/^(?:=)/,/^(?:[ ]+(?=[^,]))/,/^(?:\s+)/,/^(?:\{)/,/^(?:\})/,/^(?::[\s]*)/,/^(?:\{)/,/^(?:\})/,/^(?:\([\s]*(?=[$'"\[\{\-0-9\w()!]))/,/^(?:\))/,/^(?:\[[\s]*(?=[\-$"'0-9{\[\]]+))/,/^(?:\])/,/^(?:\.\.)/,/^(?:\.(?=[a-zA-Z_]))/,/^(?:\.(?=[\d]))/,/^(?:,[ ]*)/,/^(?:"(\\"|[^\"])*")/,/^(?:'(\\'|[^\'])*')/,/^(?:null\b)/,/^(?:false\b)/,/^(?:true\b)/,/^(?:[0-9]+)/,/^(?:[_a-zA-Z][a-zA-Z0-9_\-]*)/,/^(?:[_a-zA-Z][a-zA-Z0-9_\-]*[ ]*(?=\())/,/^(?:#)/,/^(?:.)/,/^(?:\s+)/,/^(?:[\$#])/,/^(?:$)/,/^(?:$)/],
+conditions: {"mu":{"rules":[5,38,39,47,48,49,50,51,52,54,63,65,66,67,69],"inclusive":false},"c":{"rules":[20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,49,50,51,52,54,55,56,57,58,59,60,61,62,63],"inclusive":false},"i":{"rules":[20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,43,44,44,45,45,46,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63],"inclusive":false},"h":{"rules":[3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,38,39,40,41,46,49,50,51,52,54,62,64,66,67,69],"inclusive":false},"esc":{"rules":[68],"inclusive":false},"run":{"rules":[38,39,40,42,43,44,45,46,49,50,51,52,54,55,56,57,58,59,60,61,62,63,66,67,69],"inclusive":false},"INITIAL":{"rules":[0,1,2,70],"inclusive":true}}
 });
@@ -999,0 +1007,0 @@ return lexer;

Fixed alerts

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

385270

increased by0.35%

Lines of code

2763

increased by0.69%

Number of low quality alerts

1

decreased by-50%

No dependency changes