velocityjs - npm Package Compare versions

Comparing version 2.0.3 to 2.0.4

History.md

@@ -0,1 +1,23 @@
+### Changelog
+
+All notable changes to this project will be documented in this file. Dates are displayed in UTC.
+
+#### [v2.0.4](https://github.com/shepherdwind/velocity.js/compare/v2.0.3...v2.0.4)
+
+> 27 October 2021
+
+- fix: support null as var, fix #139 [`#139`](https://github.com/shepherdwind/velocity.js/issues/139)
+- chore: support auto changelog [`984fc38`](https://github.com/shepherdwind/velocity.js/commit/984fc387b9dd1b09887a622af49005b4bd27de93)
+- chore: update history.md [`600548e`](https://github.com/shepherdwind/velocity.js/commit/600548eaa8789d7f8b9c3762b8af7794bfbc9b71)
+
+#### [v2.0.3](https://github.com/shepherdwind/velocity.js/compare/v2.0.2...v2.0.3)
+
+> 2 December 2020
+
+- fix: issue with loop variable access inside nested foreach statements [`#136`](https://github.com/shepherdwind/velocity.js/pull/136)
+- fix: issue with loop variable access inside nested foreach statements [`#135`](https://github.com/shepherdwind/velocity.js/issues/135)
+- chore: 2.0.3 [`93245a5`](https://github.com/shepherdwind/velocity.js/commit/93245a5e539c829e707f32ae1bcae600bfb7280d)
+
+<!-- auto-changelog-above -->
+
 ## 2.0.3 2020-12-02
@@ -21,3 +43,3 @@
 #set($foo = '<div>') $foo
-``` 
+```
 
@@ -102,3 +124,3 @@ At 1.x , result is `&lt;div&gt;`, for 2.x, output result `<div>`, no escapeHtml variable.
 - fix bug when render `#foreach(${itemData} in ${defaultData})`, see
-[#69](https://github.com/shepherdwind/velocity.js/issues/69#issuecomment-230152986)
+  [#69](https://github.com/shepherdwind/velocity.js/issues/69#issuecomment-230152986)
 
@@ -176,3 +198,3 @@ ## 0.8.3 2016-06-15
 - fix: allow optional space after colon in map passed as parameter to macro
-      ([#38](https://github.com/shepherdwind/velocity.js/pull/38) by @jamescookie)
+  ([#38](https://github.com/shepherdwind/velocity.js/pull/38) by @jamescookie)
 
@@ -179,0 +201,0 @@ ### 0.4.9 / 2014-12-29

package.json

 {
   "name": "velocityjs",
   "description": "Velocity Template Language(VTL) for JavaScript",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "license": "MIT",
@@ -26,2 +26,3 @@ "keywords": [
   "devDependencies": {
+    "auto-changelog": "^2.3.0",
     "coveralls": "~2.11.2",
@@ -36,4 +37,12 @@ "istanbul": "~0.3.5",
     "test": "mocha test --require should",
-    "pub": "npm version patch && npm publish && git push origin master && git push origin --tag"
+    "prepublishOnly1": "npm run version && PACKAGE_VERSION=$(node -p -e \"require('./package.json').version\") npm run tag",
+    "version": "npm run changelog && git add . && git commit -m 'chore: update history.md' && git push origin",
+    "tag": "if [[ $PACKAGE_VERSION != *\"beta\"* ]];then git tag v$PACKAGE_VERSION && git push --tags; fi",
+    "changelog": "auto-changelog -p -u"
   },
+  "auto-changelog": {
+    "output": "History.md",
+    "hideCredit": true,
+    "startingVersion": "v2.0.3"
+  },
   "spm": {
@@ -40,0 +49,0 @@ "main": "index.js",

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,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 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,83],$V8=[1,29],$V9=[1,34],$Va=[1,30],$Vb=[1,33],$Vc=[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,83,85,94],$Vd=[1,51],$Ve=[1,56],$Vf=[1,57],$Vg=[1,74],$Vh=[1,73],$Vi=[1,86],$Vj=[1,81],$Vk=[1,89],$Vl=[1,97],$Vm=[1,92],$Vn=[1,87],$Vo=[1,96],$Vp=[1,93],$Vq=[1,94],$Vr=[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,76,81,83,84,85,94],$Vs=[1,109],$Vt=[1,123],$Vu=[1,119],$Vv=[1,120],$Vw=[1,133],$Vx=[23,50,85],$Vy=[2,98],$Vz=[23,39,49,50,85],$VA=[23,39,49,50,54,55,56,57,58,59,60,61,62,63,64,65,66,83,85],$VB=[23,39,49,50,54,55,56,57,58,59,60,61,62,63,64,65,66,83,85,96],$VC=[2,111],$VD=[23,39,49,50,54,55,56,57,58,59,60,61,62,63,64,65,66,83,85,94],$VE=[2,114],$VF=[1,142],$VG=[1,148],$VH=[23,49,50],$VI=[1,153],$VJ=[1,154],$VK=[1,155],$VL=[1,156],$VM=[1,157],$VN=[1,158],$VO=[1,159],$VP=[1,160],$VQ=[1,161],$VR=[1,162],$VS=[1,163],$VT=[1,164],$VU=[1,165],$VV=[23,54,55,56,57,58,59,60,61,62,63,64,65,66],$VW=[50,85],$VX=[2,115],$VY=[23,35],$VZ=[1,215],$V_=[1,214],$V$=[39,50],$V01=[23,54,55],$V11=[23,54,55,56,57,61,62,63,64,65,66],$V21=[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,"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]],
+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,"BOOL":73,"methodbd":74,"VAR_BEGIN":75,"VAR_END":76,"attribute":77,"method":78,"index":79,"property":80,"DOT":81,"params":82,"CONTENT":83,"BRACKET":84,"CLOSE_BRACKET":85,"string":86,"number":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:"!",73:"BOOL",75:"VAR_BEGIN",76:"VAR_END",81:"DOT",83:"CONTENT",84:"BRACKET",85:"CLOSE_BRACKET",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,3],[7,2],[7,5],[7,3],[7,2],[7,4],[7,2],[7,4],[70,1],[70,1],[72,1],[72,1],[71,1],[71,2],[77,1],[77,1],[77,1],[78,2],[74,4],[74,3],[82,1],[82,1],[82,1],[82,3],[82,3],[80,2],[80,2],[79,3],[79,3],[79,3],[79,2],[79,2],[69,1],[69,1],[69,1],[87,1],[87,3],[87,4],[88,1],[88,2],[86,1],[86,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 35: case 41: case 42: case 86: case 94: case 96:
+case 3: case 35: case 41: case 42: case 88: case 96: case 98:
  this.$ = [$$[$0]]; 
 break;
-case 4: case 36: case 87:
+case 4: case 36: case 89:
  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 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:
+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 84: case 85: case 86: case 87: case 93: case 101: case 108: case 109: case 114: case 120: case 122: case 135: case 136:
  this.$ = $$[$0]; 
@@ -164,6 +164,6 @@ break;
 break;
-case 43: case 44: case 45: case 46: case 97: case 98:
+case 43: case 44: case 45: case 46: case 99: case 100:
  this.$ = [].concat($$[$0-2], $$[$0]); 
 break;
-case 49: case 50: case 101: case 102:
+case 49: case 50: case 103: case 104:
  this.$ = $$[$0-1]; 
@@ -213,105 +213,105 @@ break;
 break;
-case 75:
+case 75: case 76:
  this.$ = {type: "references", id: $$[$0-1], path: $$[$0], leader: $$[$0-2] }; 
 break;
-case 76:
+case 77: case 80:
+ this.$ = {type: "references", id: $$[$0], leader: $$[$0-1] }; 
+break;
+case 78:
  this.$ = {type: "references", id: $$[$0-2].id, path: $$[$0-1], isWraped: true, leader: $$[$0-4], args: $$[$0-2].args }; 
 break;
-case 77:
+case 79:
  this.$ = {type: "references", id: $$[$0-1].id, path: $$[$0], leader: $$[$0-2], args: $$[$0-1].args }; 
 break;
-case 78:
- this.$ = {type: "references", id: $$[$0], leader: $$[$0-1] }; 
-break;
-case 79:
+case 81:
  this.$ = {type: "references", id: $$[$0-1], isWraped: true, leader: $$[$0-3] }; 
 break;
-case 80:
+case 82:
  this.$ = {type: "references", id: $$[$0].id, leader: $$[$0-1], args: $$[$0].args }; 
 break;
-case 81:
+case 83:
  this.$ = {type: "references", id: $$[$0-1].id, isWraped: true, args: $$[$0-1].args, leader: $$[$0-3] }; 
 break;
-case 88:
+case 90:
  this.$ = {type:"method", id: $$[$0].id, args: $$[$0].args }; 
 break;
-case 89:
+case 91:
  this.$ = {type: "index", id: $$[$0] }; 
 break;
-case 90:
+case 92:
  this.$ = {type: "property", id: $$[$0] }; if ($$[$0].type === 'content') this.$ = $$[$0]; 
 break;
-case 92:
+case 94:
  this.$ = {id: $$[$0-3], args: $$[$0-1] }; 
 break;
-case 93:
+case 95:
  this.$ = {id: $$[$0-2], args: false }; 
 break;
-case 95:
+case 97:
  this.$ = [ { type: 'runt', value: $$[$0] } ]; 
 break;
-case 100:
+case 102:
  this.$ = {type: 'content', value: $$[$0-1] + $$[$0] }; 
 break;
-case 103:
+case 105:
  this.$ = {type: "content", value: $$[$0-2] + $$[$0-1].value + $$[$0] }; 
 break;
-case 104: case 105:
+case 106: case 107:
  this.$ = {type: "content", value: $$[$0-1] + $$[$0] }; 
 break;
-case 108:
+case 110:
  this.$ = {type: 'bool', value: $$[$0] }; 
 break;
-case 109:
+case 111:
  this.$ = {type: "integer", value: $$[$0]}; 
 break;
-case 110:
+case 112:
  this.$ = {type: "decimal", value: + ($$[$0-2] + '.' + $$[$0]) }; 
 break;
-case 111:
+case 113:
  this.$ = {type: "decimal", value: - ($$[$0-2] + '.' + $$[$0]) }; 
 break;
-case 113:
+case 115:
  this.$ = - parseInt($$[$0], 10); 
 break;
-case 114:
+case 116:
  this.$ = {type: 'string', value: $$[$0] }; 
 break;
-case 115:
+case 117:
  this.$ = {type: 'string', value: $$[$0], isEval: true }; 
 break;
-case 116: case 117:
+case 118: case 119:
  this.$ = $$[$0];
 break;
-case 119:
+case 121:
  this.$ = {type: 'array', value: $$[$0-1] }; 
 break;
-case 121:
+case 123:
  this.$ = {type: 'array', value: [] }; 
 break;
-case 122: case 123: case 124: case 125:
+case 124: case 125: case 126: case 127:
  this.$ = {type: 'array', isRange: true, value: [$$[$0-3], $$[$0-1]]}; 
 break;
-case 126:
+case 128:
  this.$ = {type: 'map', value: $$[$0-1] }; 
 break;
-case 127:
+case 129:
  this.$ = {type: 'map'}; 
 break;
-case 128: case 129:
+case 130: case 131:
  this.$ = {}; this.$[$$[$0-2].value] = $$[$0]; 
 break;
-case 130:
+case 132:
  this.$ = {}; this.$[$$[$0-1].value] = $$[$01]; 
 break;
-case 131: case 132:
+case 133: case 134:
  this.$ = $$[$0-4]; this.$[$$[$0-2].value] = $$[$0]; 
 break;
-case 135: case 138:
+case 137: case 140:
  this.$ = $$[$0-1] + $$[$0]; 
 break;
-case 136:
+case 138:
  this.$ = $$[$0-2] + $$[$0-1] + $$[$0]; 
 break;
-case 137:
+case 139:
  this.$ = $$[$0-2] + $$[$0-1]; 
@@ -321,4 +321,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,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]},
+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,83:$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,83:$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:$Va,74:31,75:$Vb,83:[1,32]},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,35],27:[1,38],29:[1,39],31:[1,40],32:[1,41],33:[1,42],34:[1,43],36:[1,37],41:[1,44],42:[1,45],43:[1,46],83:[1,36]},o($V7,[2,19]),o($V7,[2,20]),o($V7,[2,21]),o($V7,[2,135]),o($V7,[2,136]),{36:[1,47]},{1:[2,2]},o($V7,[2,4]),{36:[1,48],74:49},o($Vc,[2,80],{71:50,77:52,78:53,79:54,80:55,22:$Vd,81:$Ve,84:$Vf}),o($Vc,[2,77],{77:52,78:53,79:54,80:55,71:58,81:$Ve,84:$Vf}),o($Vc,[2,82],{77:52,78:53,79:54,80:55,71:59,81:$Ve,84:$Vf}),o($V7,[2,140]),{36:[2,84]},{36:[2,85]},{22:[1,60]},o($V7,[2,137]),{4:[1,62],22:[1,63],83:[1,61]},{22:[1,64]},{22:[1,65]},{22:[1,66]},o($V7,[2,25]),o($V7,[2,26]),{22:[1,67]},o($V7,[2,31]),{22:[1,68]},{22:[1,69]},{22:[1,70]},{22:$Vd,39:$Vg,71:71,72:72,76:$Vh,77:52,78:53,79:54,80:55,81:$Ve,84:$Vf},{39:$Vg,71:75,72:76,76:$Vh,77:52,78:53,79:54,80:55,81:$Ve,84:$Vf},o($Vc,[2,75],{78:53,79:54,80:55,77:77,81:$Ve,84:$Vf}),{7:82,23:[1,79],35:$Vi,36:$Vj,38:$Vk,40:83,48:80,52:84,57:$Vl,69:85,73:$Vm,82:78,84:$Vn,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq,93:88},o($Vr,[2,88]),o($Vr,[2,90]),o($Vr,[2,91]),o($Vr,[2,92]),{36:[1,99],74:98,83:[1,100]},{7:102,35:$Vi,57:$Vl,69:101,73:$Vm,83:[1,103],85:[1,104],86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},o($Vc,[2,76],{78:53,79:54,80:55,77:77,81:$Ve,84:$Vf}),o($Vc,[2,79],{78:53,79:54,80:55,77:77,81:$Ve,84:$Vf}),{23:[1,105]},o($V7,[2,138]),o($V7,[2,139]),{7:111,23:[1,107],35:$Vi,38:$Vk,40:83,45:106,47:108,48:110,49:$Vs,52:84,57:$Vl,69:85,73:$Vm,84:$Vn,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq,93:88},{7:113,28:112,35:$Vi},{7:121,22:$Vt,30:114,35:$Vi,38:$Vk,40:115,52:116,53:117,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,84:$Vn,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq,93:88},{7:121,22:$Vt,30:124,35:$Vi,38:$Vk,40:115,52:116,53:117,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,84:$Vn,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq,93:88},{35:[1,125]},{35:[1,126]},{36:[1,127]},{7:111,23:[1,129],35:$Vi,38:$Vk,40:83,45:128,47:108,48:110,49:$Vs,52:84,57:$Vl,69:85,73:$Vm,84:$Vn,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq,93:88},{39:$Vg,72:130,76:$Vh,77:77,78:53,79:54,80:55,81:$Ve,84:$Vf},o($Vc,[2,81]),o($Vc,[2,86]),o($Vc,[2,87]),{39:$Vg,72:131,76:$Vh,77:77,78:53,79:54,80:55,81:$Ve,84:$Vf},o($Vc,[2,83]),o($Vr,[2,89]),{23:[1,132],50:$Vw},o($Vr,[2,95]),o($Vx,[2,96]),o($Vx,[2,97]),o([23,50],$Vy),o($Vz,[2,118]),o($Vz,[2,119]),o($Vz,[2,120]),{36:$V8,38:$V9,70:28,73:$Va,74:31,75:$Vb},{7:137,35:$Vi,36:$Vj,38:$Vk,40:83,48:80,52:84,57:$Vl,69:85,73:$Vm,82:134,84:$Vn,85:[1,135],86:90,87:91,88:136,89:$Vo,91:$Vp,92:$Vq,93:88},o($Vz,[2,122]),{39:[1,139],86:140,91:$Vp,92:$Vq,95:138},o($VA,[2,108]),o($VA,[2,109]),o($VA,[2,110]),o($VB,[2,116]),o($VB,[2,117]),o($VA,$VC),o($VD,$VE,{90:[1,141]}),{89:$VF},o($Vr,[2,93]),o($Vr,[2,101],{22:$Vd}),o($Vr,[2,102]),{83:[1,144],85:[1,143]},{85:[1,145]},o($Vr,[2,106]),o($Vr,[2,107]),o($V7,[2,18]),{23:[1,146]},o($V7,[2,38]),{23:[2,47],49:[1,147],50:$VG},{7:111,35:$Vi,38:$Vk,40:83,47:149,48:110,52:84,57:$Vl,69:85,73:$Vm,84:$Vn,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq,93:88},o($VH,[2,41]),o($VH,[2,42]),{23:[1,150]},{51:[1,151]},{23:[1,152]},{23:[2,52]},{23:[2,53]},{23:[2,54],54:$VI,55:$VJ,56:$VK,57:$VL,58:$VM,59:$VN,60:$VO,61:$VP,62:$VQ,63:$VR,64:$VS,65:$VT,66:$VU},o($VV,[2,68]),{22:$Vt,67:166,89:$VF},{7:121,22:$Vt,35:$Vi,53:167,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},o($VV,[2,71]),o($VV,[2,72]),{7:121,22:$Vt,35:$Vi,53:168,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},{23:[1,169]},{36:[1,170],38:[1,171]},{36:[1,172]},{7:175,23:[1,174],35:$Vi,44:173},{23:[1,176]},o($V7,[2,40]),o($Vc,[2,74]),o($Vc,[2,78]),o($Vr,[2,94]),{7:178,35:$Vi,38:$Vk,40:83,48:177,52:84,57:$Vl,69:85,73:$Vm,84:$Vn,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq,93:88},{50:$Vw,85:[1,179]},o($Vz,[2,123]),o($VW,$VC,{94:[1,180]}),o($VW,$Vy,{94:[1,181]}),{39:[1,182],50:[1,183]},o($Vz,[2,129]),{96:[1,184]},{89:[1,185]},o($VD,$VX,{90:[1,186]}),o($Vr,[2,103]),o($Vr,[2,105]),o($Vr,[2,104]),o($V7,[2,37]),{7:188,23:[2,50],35:$Vi,38:$Vk,40:83,48:187,52:84,57:$Vl,69:85,73:$Vm,84:$Vn,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq,93:88},{7:190,35:$Vi,38:$Vk,40:83,48:189,52:84,57:$Vl,69:85,73:$Vm,84:$Vn,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq,93:88},{23:[2,48],49:[1,191],50:$VG},o($V7,[2,22]),{7:121,22:$Vt,30:192,35:$Vi,38:$Vk,40:115,52:116,53:117,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,84:$Vn,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq,93:88},o($V7,[2,23]),{7:121,22:$Vt,35:$Vi,53:193,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},{7:121,22:$Vt,35:$Vi,53:194,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},{7:121,22:$Vt,35:$Vi,53:195,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},{7:121,22:$Vt,35:$Vi,53:196,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},{7:121,22:$Vt,35:$Vi,53:197,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},{7:121,22:$Vt,35:$Vi,53:198,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},{7:121,22:$Vt,35:$Vi,53:199,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},{7:121,22:$Vt,35:$Vi,53:200,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},{7:121,22:$Vt,35:$Vi,53:201,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},{7:121,22:$Vt,35:$Vi,53:202,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},{7:121,22:$Vt,35:$Vi,53:203,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},{7:121,22:$Vt,35:$Vi,53:204,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},{7:121,22:$Vt,35:$Vi,53:205,57:$Vu,67:118,68:$Vv,69:122,73:$Vm,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq},o($VV,[2,69]),o($VV,[2,70]),{23:[1,206],54:$VI,55:$VJ,56:$VK,57:$VL,58:$VM,59:$VN,60:$VO,61:$VP,62:$VQ,63:$VR,64:$VS,65:$VT,66:$VU},o($V7,[2,24]),{37:[1,207]},{36:[1,208]},{23:[1,209]},{7:211,23:[1,210],35:$Vi},o($V7,[2,34]),o($VY,[2,35]),o($V7,[2,39]),o($Vx,[2,99]),o($Vx,[2,100]),o($Vz,[2,121]),{7:213,35:$Vi,57:$VZ,88:212,89:$V_},{7:217,35:$Vi,57:$VZ,88:216,89:$V_},o($Vz,[2,128]),{86:218,91:$Vp,92:$Vq},o($V$,[2,132],{40:83,52:84,69:85,93:88,86:90,87:91,88:95,48:219,7:220,35:$Vi,38:$Vk,57:$Vl,73:$Vm,84:$Vn,89:$Vo,91:$Vp,92:$Vq}),o($VA,[2,112]),{89:[1,221]},o($VH,[2,43]),o($VH,[2,46]),o($VH,[2,44]),o($VH,[2,45]),{7:188,23:[2,49],35:$Vi,38:$Vk,40:83,48:187,52:84,57:$Vl,69:85,73:$Vm,84:$Vn,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq,93:88},{23:[2,51]},o($V01,[2,55],{56:$VK,57:$VL,58:$VM,59:$VN,60:$VO,61:$VP,62:$VQ,63:$VR,64:$VS,65:$VT,66:$VU}),o($V01,[2,56],{56:$VK,57:$VL,58:$VM,59:$VN,60:$VO,61:$VP,62:$VQ,63:$VR,64:$VS,65:$VT,66:$VU}),o($V11,[2,57],{58:$VM,59:$VN,60:$VO}),o($V11,[2,58],{58:$VM,59:$VN,60:$VO}),o($VV,[2,59]),o($VV,[2,60]),o($VV,[2,61]),o($V21,[2,62],{56:$VK,57:$VL,58:$VM,59:$VN,60:$VO}),o($V21,[2,63],{56:$VK,57:$VL,58:$VM,59:$VN,60:$VO}),o($V21,[2,64],{56:$VK,57:$VL,58:$VM,59:$VN,60:$VO}),o($V21,[2,65],{56:$VK,57:$VL,58:$VM,59:$VN,60:$VO}),o($V21,[2,66],{56:$VK,57:$VL,58:$VM,59:$VN,60:$VO}),o($V21,[2,67],{56:$VK,57:$VL,58:$VM,59:$VN,60:$VO}),o($VV,[2,73]),{7:222,35:$Vi,40:223,84:$Vn,93:88},{39:[1,224]},o($V7,[2,32]),o($V7,[2,33]),o($VY,[2,36]),{85:[1,225]},{85:[1,226]},{85:$VE},{89:[1,227]},{85:[1,228]},{85:[1,229]},{96:[1,230]},o($V$,[2,130]),o($V$,[2,131]),o($VA,[2,113]),{23:[1,231]},{23:[1,232]},{37:[1,233]},o($Vz,[2,124]),o($Vz,[2,126]),{85:$VX},o($Vz,[2,125]),o($Vz,[2,127]),{7:234,35:$Vi,38:$Vk,40:83,48:235,52:84,57:$Vl,69:85,73:$Vm,84:$Vn,86:90,87:91,88:95,89:$Vo,91:$Vp,92:$Vq,93:88},o($V7,[2,27]),o($V7,[2,29]),{7:236,35:$Vi,40:237,84:$Vn,93:88},o($V$,[2,133]),o($V$,[2,134]),{23:[1,238]},{23:[1,239]},o($V7,[2,28]),o($V7,[2,30])],
+defaultActions: {2:[2,1],26:[2,2],33:[2,84],34:[2,85],115:[2,52],116:[2,53],192:[2,51],214:[2,114],227:[2,115]},
 parseError: function parseError (str, hash) {
@@ -810,3 +810,3 @@ if (hash.recoverable) {
                                     if (_num > 1) yy_.yytext = yy_.yytext.replace(/(\\\\)+$/, '\\');
-                                    if(yy_.yytext) return 82;
+                                    if(yy_.yytext) return 83;
                                   
@@ -825,6 +825,6 @@ break;
                                     if (_num > 1) yy_.yytext = yy_.yytext.replace(/(\\\\)+$/, '\\');
-                                    if(yy_.yytext) return 82;
+                                    if(yy_.yytext) return 83;
                                   
 break;
-case 2: return 82; 
+case 2: return 83; 
 break;
@@ -924,5 +924,5 @@ case 3: this.popState(); return 11;
 break;
-case 47: yy.begin = true; return 74; 
+case 47: yy.begin = true; return 75; 
 break;
-case 48: this.popState(); if (yy.begin === true) { yy.begin = false; return 75;} else { return 82; } 
+case 48: this.popState(); if (yy.begin === true) { yy.begin = false; return 76;} else { return 83; } 
 break;
@@ -952,13 +952,13 @@ case 49: this.begin("c"); return 22;
                                     } else {
-                                      return 82; 
+                                      return 83; 
                                     }
                                   
 break;
-case 51: this.begin("i"); return 83; 
+case 51: this.begin("i"); return 84; 
 break;
 case 52: 
                                     if (this.popState() === "i") {
-                                      return 84; 
+                                      return 85; 
                                     } else {
-                                      return 82;
+                                      return 83;
                                     }
@@ -969,3 +969,3 @@
 break;
-case 54: return 80; 
+case 54: return 81; 
 break;
@@ -980,7 +980,7 @@ case 55: return 90;
 break;
-case 59: return 87; 
+case 59: return 73; 
 break;
-case 60: return 87; 
+case 60: return 73; 
 break;
-case 61: return 87; 
+case 61: return 73; 
 break;
@@ -995,7 +995,7 @@ case 62: return 89;
 break;
-case 66: this.popState(); return 82; 
+case 66: this.popState(); return 83; 
 break;
-case 67: this.popState(); return 82; 
+case 67: this.popState(); return 83; 
 break;
-case 68: this.popState(); return 82; 
+case 68: this.popState(); return 83; 
 break;
@@ -1008,3 +1008,3 @@ case 69: this.popState(); return 4;
 },
-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]*)/,/^(?:[\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+)/,/^(?:[\$#])/,/^(?:$)/,/^(?:$)/],
+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]*)/,/^(?:[\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}}
@@ -1011,0 +1011,0 @@ });

test/set.test.js

@@ -257,2 +257,8 @@ var Velocity = require('../src/velocity')
   });
+
+  it('support set null, fix #139', function() {
+    var tpl = '#set($null = "<span>-</span>")$null';
+    var ret = render(tpl).trim();
+    assert.strictEqual(ret, '<span>-</span>');
+  });
 })

No alert changes

Improved metrics

Total package byte prevSize

180553

increased by1.16%

Lines of code

3784

increased by0.19%

Worsened metrics

Dev dependency count

7

increased by16.67%

No dependency changes