velocityjs - npm Package Compare versions

Comparing version 0.6.1 to 0.6.2

History.md

@@ -0,1 +1,5 @@
+## 0.6.2
+
+- feat: merge [47](https://github.com/shepherdwind/velocity.js/pull/47)
+
 ## 0.6.1
@@ -2,0 +6,0 @@

package.json

 {
   "name": "velocityjs",
   "description": "Velocity Template Language(VTL) for JavaScript",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "keywords": [
@@ -6,0 +6,0 @@ "velocity template"

src/compile/compile.js

@@ -85,2 +85,6 @@ module.exports = function(Velocity, utils){
 
+          case 'raw':
+            str += ast.value;
+            break;
+
           default:
@@ -87,0 +91,0 @@ str += typeof ast == 'string' ? ast : this.getBlock(ast);

src/parse/index.js

@@ -75,8 +75,8 @@ /* parser generated by jison 0.4.15 */
 var parser = (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,18],$V2=[1,9],$V3=[1,22],$V4=[1,21],$V5=[4,10,19,33,34,79],$V6=[1,26],$V7=[1,29],$V8=[1,30],$V9=[4,10,19,22,33,34,44,45,46,49,50,51,52,53,54,55,56,57,58,59,60,61,72,79,81,91],$Va=[1,46],$Vb=[1,51],$Vc=[1,52],$Vd=[1,66],$Ve=[1,67],$Vf=[1,78],$Vg=[1,89],$Vh=[1,81],$Vi=[1,79],$Vj=[1,84],$Vk=[1,88],$Vl=[1,85],$Vm=[1,86],$Vn=[4,10,19,22,33,34,44,45,46,49,50,51,52,53,54,55,56,57,58,59,60,61,71,72,77,79,80,81,91],$Vo=[1,115],$Vp=[1,111],$Vq=[1,112],$Vr=[1,123],$Vs=[22,45,81],$Vt=[2,89],$Vu=[22,44,45,72,81],$Vv=[22,44,45,49,50,51,52,53,54,55,56,57,58,59,60,61,72,79,81],$Vw=[22,44,45,49,50,51,52,53,54,55,56,57,58,59,60,61,72,79,81,93],$Vx=[2,102],$Vy=[22,44,45,49,50,51,52,53,54,55,56,57,58,59,60,61,72,79,81,91],$Vz=[2,105],$VA=[1,132],$VB=[1,138],$VC=[22,44,45],$VD=[1,143],$VE=[1,144],$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=[22,49,50,51,52,53,54,55,56,57,58,59,60,61],$VR=[45,81],$VS=[2,106],$VT=[22,33],$VU=[1,202],$VV=[1,201],$VW=[45,72],$VX=[22,49,50],$VY=[22,49,50,51,52,56,57,58,59,60,61],$VZ=[22,49,50,56,57,58,59,60,61];
+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,30],$V9=[1,31],$Va=[4,10,11,20,23,34,35,45,46,47,50,51,52,53,54,55,56,57,58,59,60,61,62,73,80,82,92],$Vb=[1,47],$Vc=[1,52],$Vd=[1,53],$Ve=[1,67],$Vf=[1,68],$Vg=[1,79],$Vh=[1,90],$Vi=[1,82],$Vj=[1,80],$Vk=[1,85],$Vl=[1,89],$Vm=[1,86],$Vn=[1,87],$Vo=[4,10,11,20,23,34,35,45,46,47,50,51,52,53,54,55,56,57,58,59,60,61,62,72,73,78,80,81,82,92],$Vp=[1,116],$Vq=[1,112],$Vr=[1,113],$Vs=[1,124],$Vt=[23,46,82],$Vu=[2,90],$Vv=[23,45,46,73,82],$Vw=[23,45,46,50,51,52,53,54,55,56,57,58,59,60,61,62,73,80,82],$Vx=[23,45,46,50,51,52,53,54,55,56,57,58,59,60,61,62,73,80,82,94],$Vy=[2,103],$Vz=[23,45,46,50,51,52,53,54,55,56,57,58,59,60,61,62,73,80,82,92],$VA=[2,106],$VB=[1,133],$VC=[1,139],$VD=[23,45,46],$VE=[1,144],$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=[23,50,51,52,53,54,55,56,57,58,59,60,61,62],$VS=[46,82],$VT=[2,107],$VU=[23,34],$VV=[1,203],$VW=[1,202],$VX=[46,73],$VY=[23,50,51],$VZ=[23,50,51,52,53,57,58,59,60,61,62],$V_=[23,50,51,57,58,59,60,61,62];
 var parser = {trace: function trace() { },
 yy: {},
-symbols_: {"error":2,"root":3,"EOF":4,"statements":5,"statement":6,"references":7,"directives":8,"content":9,"COMMENT":10,"set":11,"if":12,"elseif":13,"else":14,"end":15,"foreach":16,"break":17,"define":18,"HASH":19,"NOESCAPE":20,"PARENTHESIS":21,"CLOSE_PARENTHESIS":22,"macro":23,"macro_call":24,"SET":25,"equal":26,"IF":27,"expression":28,"ELSEIF":29,"ELSE":30,"END":31,"FOREACH":32,"DOLLAR":33,"ID":34,"IN":35,"array":36,"BREAK":37,"DEFINE":38,"MACRO":39,"macro_args":40,"macro_call_args_all":41,"macro_call_args":42,"literals":43,"SPACE":44,"COMMA":45,"EQUAL":46,"map":47,"math":48,"||":49,"&&":50,"+":51,"-":52,"*":53,"/":54,"%":55,">":56,"<":57,"==":58,">=":59,"<=":60,"!=":61,"parenthesis":62,"!":63,"literal":64,"brace_begin":65,"attributes":66,"brace_end":67,"methodbd":68,"VAR_BEGIN":69,"MAP_BEGIN":70,"VAR_END":71,"MAP_END":72,"attribute":73,"method":74,"index":75,"property":76,"DOT":77,"params":78,"CONTENT":79,"BRACKET":80,"CLOSE_BRACKET":81,"string":82,"number":83,"BOOL":84,"integer":85,"INTEGER":86,"DECIMAL_POINT":87,"STRING":88,"EVAL_STRING":89,"range":90,"RANGE":91,"map_item":92,"MAP_SPLIT":93,"$accept":0,"$end":1},
-terminals_: {2:"error",4:"EOF",10:"COMMENT",19:"HASH",20:"NOESCAPE",21:"PARENTHESIS",22:"CLOSE_PARENTHESIS",25:"SET",27:"IF",29:"ELSEIF",30:"ELSE",31:"END",32:"FOREACH",33:"DOLLAR",34:"ID",35:"IN",37:"BREAK",38:"DEFINE",39:"MACRO",44:"SPACE",45:"COMMA",46:"EQUAL",49:"||",50:"&&",51:"+",52:"-",53:"*",54:"/",55:"%",56:">",57:"<",58:"==",59:">=",60:"<=",61:"!=",63:"!",69:"VAR_BEGIN",70:"MAP_BEGIN",71:"VAR_END",72:"MAP_END",77:"DOT",79:"CONTENT",80:"BRACKET",81:"CLOSE_BRACKET",84:"BOOL",86:"INTEGER",87:"DECIMAL_POINT",88:"STRING",89:"EVAL_STRING",91:"RANGE",93:"MAP_SPLIT"},
-productions_: [0,[3,1],[3,2],[5,1],[5,2],[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],[11,5],[12,5],[13,5],[14,2],[15,2],[16,8],[16,8],[17,2],[18,6],[23,6],[23,5],[40,1],[40,2],[24,5],[24,4],[42,1],[42,1],[42,3],[42,3],[42,3],[42,3],[41,1],[41,2],[41,3],[41,2],[26,3],[28,1],[28,1],[28,1],[48,3],[48,3],[48,3],[48,3],[48,3],[48,3],[48,3],[48,3],[48,3],[48,3],[48,3],[48,3],[48,3],[48,1],[48,2],[48,2],[48,1],[48,1],[62,3],[7,5],[7,3],[7,5],[7,3],[7,2],[7,4],[7,2],[7,4],[65,1],[65,1],[67,1],[67,1],[66,1],[66,2],[73,1],[73,1],[73,1],[74,2],[68,4],[68,3],[78,1],[78,1],[78,3],[78,3],[76,2],[76,2],[75,3],[75,3],[75,3],[75,2],[75,2],[64,1],[64,1],[64,1],[83,1],[83,3],[83,4],[85,1],[85,2],[82,1],[82,1],[43,1],[43,1],[43,1],[36,3],[36,1],[36,2],[90,5],[90,5],[90,5],[90,5],[47,3],[47,2],[92,3],[92,3],[92,2],[92,5],[92,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,"SET":26,"equal":27,"IF":28,"expression":29,"ELSEIF":30,"ELSE":31,"END":32,"FOREACH":33,"DOLLAR":34,"ID":35,"IN":36,"array":37,"BREAK":38,"DEFINE":39,"MACRO":40,"macro_args":41,"macro_call_args_all":42,"macro_call_args":43,"literals":44,"SPACE":45,"COMMA":46,"EQUAL":47,"map":48,"math":49,"||":50,"&&":51,"+":52,"-":53,"*":54,"/":55,"%":56,">":57,"<":58,"==":59,">=":60,"<=":61,"!=":62,"parenthesis":63,"!":64,"literal":65,"brace_begin":66,"attributes":67,"brace_end":68,"methodbd":69,"VAR_BEGIN":70,"MAP_BEGIN":71,"VAR_END":72,"MAP_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",38:"BREAK",39:"DEFINE",40:"MACRO",45:"SPACE",46:"COMMA",47:"EQUAL",50:"||",51:"&&",52:"+",53:"-",54:"*",55:"/",56:"%",57:">",58:"<",59:"==",60:">=",61:"<=",62:"!=",64:"!",70:"VAR_BEGIN",71:"MAP_BEGIN",72:"VAR_END",73:"MAP_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,8],[18,2],[19,6],[24,6],[24,5],[41,1],[41,2],[25,5],[25,4],[43,1],[43,1],[43,3],[43,3],[43,3],[43,3],[42,1],[42,2],[42,3],[42,2],[27,3],[29,1],[29,1],[29,1],[49,3],[49,3],[49,3],[49,3],[49,3],[49,3],[49,3],[49,3],[49,3],[49,3],[49,3],[49,3],[49,3],[49,1],[49,2],[49,2],[49,1],[49,1],[63,3],[7,5],[7,3],[7,5],[7,3],[7,2],[7,4],[7,2],[7,4],[66,1],[66,1],[68,1],[68,1],[67,1],[67,2],[74,1],[74,1],[74,1],[75,2],[69,4],[69,3],[79,1],[79,1],[79,3],[79,3],[77,2],[77,2],[76,3],[76,3],[76,3],[76,2],[76,2],[65,1],[65,1],[65,1],[84,1],[84,3],[84,4],[86,1],[86,2],[83,1],[83,1],[44,1],[44,1],[44,1],[37,3],[37,1],[37,2],[91,5],[91,5],[91,5],[91,5],[48,3],[48,2],[93,3],[93,3],[93,2],[93,5],[93,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 31: case 35: case 36: case 80: case 88: case 89:
+case 3: case 32: case 36: case 37: case 81: case 89: case 90:
  this.$ = [$$[$0]]; 
 break;
-case 4: case 32: case 81:
+case 4: case 33: case 82:
  this.$ = [].concat($$[$0-1], $$[$0]); 
@@ -106,171 +106,174 @@ break;
 break;
-case 7: case 9: case 10: case 11: case 12: case 13: case 14: case 15: case 16: case 18: case 19: case 41: case 42: case 46: case 47: case 48: case 62: case 65: case 66: case 76: case 77: case 78: case 79: case 85: case 92: case 99: case 100: case 105: case 111: case 113: case 126: case 127:
+case 7: case 10: case 11: case 12: case 13: case 14: case 15: case 16: case 17: case 19: case 20: case 42: case 43: case 47: case 48: case 49: case 63: case 66: case 67: case 77: case 78: case 79: case 80: case 86: case 93: case 100: case 101: case 106: case 112: case 114: case 127: case 128:
  this.$ = $$[$0]; 
 break;
 case 8:
+ this.$ = {type: 'raw', value: $$[$0] }; 
+break;
+case 9:
  this.$ = {type: 'comment', value: $$[$0] }; 
 break;
-case 17:
+case 18:
  this.$ = { type: 'noescape' }; 
 break;
-case 20:
+case 21:
  this.$ = {type: 'set', equal: $$[$0-1] }; 
 break;
-case 21:
+case 22:
  this.$ = {type: 'if', condition: $$[$0-1] }; 
 break;
-case 22:
+case 23:
  this.$ = {type: 'elseif', condition: $$[$0-1] }; 
 break;
-case 23:
+case 24:
  this.$ = {type: 'else' }; 
 break;
-case 24:
+case 25:
  this.$ = {type: 'end' }; 
 break;
-case 25: case 26:
+case 26: case 27:
  this.$ = {type: 'foreach', to: $$[$0-3], from: $$[$0-1] }; 
 break;
-case 27:
+case 28:
  this.$ = {type: $$[$0] }; 
 break;
-case 28:
+case 29:
  this.$ = {type: 'define', id: $$[$0-1] }; 
 break;
-case 29:
+case 30:
  this.$ = {type: 'macro', id: $$[$0-2], args: $$[$0-1] }; 
 break;
-case 30:
+case 31:
  this.$ = {type: 'macro', id: $$[$0-1] }; 
 break;
-case 33:
+case 34:
  this.$ = { type:"macro_call", id: $$[$0-3].replace(/^\s+|\s+$/g, ''), args: $$[$0-1] }; 
 break;
-case 34:
+case 35:
  this.$ = { type:"macro_call", id: $$[$0-2].replace(/^\s+|\s+$/g, '') }; 
 break;
-case 37: case 38: case 39: case 40: case 90: case 91:
+case 38: case 39: case 40: case 41: case 91: case 92:
  this.$ = [].concat($$[$0-2], $$[$0]); 
 break;
-case 43: case 44: case 94: case 95:
+case 44: case 45: case 95: case 96:
  this.$ = $$[$0-1]; 
 break;
-case 45:
+case 46:
  this.$ = [$$[$0-2], $$[$0]]; 
 break;
-case 49: case 50: case 51: case 52: case 53: case 54: case 55: case 56: case 57: case 58: case 59: case 60: case 61:
+case 50: case 51: case 52: case 53: case 54: case 55: case 56: case 57: case 58: case 59: case 60: case 61: case 62:
  this.$ = {type: 'math', expression: [$$[$0-2], $$[$0]], operator: $$[$0-1] }; 
 break;
-case 63:
+case 64:
  this.$ = {type: 'math', expression: [$$[$0]], operator: 'minus' }; 
 break;
-case 64:
+case 65:
  this.$ = {type: 'math', expression: [$$[$0]], operator: 'not' }; 
 break;
-case 67:
+case 68:
  this.$ = {type: 'math', expression: [$$[$0-1]], operator: 'parenthesis' }; 
 break;
-case 68:
+case 69:
  this.$ = {type: "references", id: $$[$0-2], path: $$[$0-1], isWraped: true, leader: $$[$0-4] }; 
 break;
-case 69:
+case 70:
  this.$ = {type: "references", id: $$[$0-1], path: $$[$0], leader: $$[$0-2] }; 
 break;
-case 70:
+case 71:
  this.$ = {type: "references", id: $$[$0-2].id, path: $$[$0-1], isWraped: true, leader: $$[$0-4], args: $$[$0-2].args }; 
 break;
-case 71:
+case 72:
  this.$ = {type: "references", id: $$[$0-1].id, path: $$[$0], leader: $$[$0-2], args: $$[$0-1].args }; 
 break;
-case 72:
+case 73:
  this.$ = {type: "references", id: $$[$0], leader: $$[$0-1] }; 
 break;
-case 73:
+case 74:
  this.$ = {type: "references", id: $$[$0-1], isWraped: true, leader: $$[$0-3] }; 
 break;
-case 74:
+case 75:
  this.$ = {type: "references", id: $$[$0].id, leader: $$[$0-1], args: $$[$0].args }; 
 break;
-case 75:
+case 76:
  this.$ = {type: "references", id: $$[$0-1].id, isWraped: true, args: $$[$0-1].args, leader: $$[$0-3] }; 
 break;
-case 82:
+case 83:
  this.$ = {type:"method", id: $$[$0].id, args: $$[$0].args }; 
 break;
-case 83:
+case 84:
  this.$ = {type: "index", id: $$[$0] }; 
 break;
-case 84:
+case 85:
  this.$ = {type: "property", id: $$[$0] }; if ($$[$0].type === 'content') this.$ = $$[$0]; 
 break;
-case 86:
+case 87:
  this.$ = {id: $$[$0-3], args: $$[$0-1] }; 
 break;
-case 87:
+case 88:
  this.$ = {id: $$[$0-2], args: false }; 
 break;
-case 93:
+case 94:
  this.$ = {type: 'content', value: $$[$0-1] + $$[$0] }; 
 break;
-case 96:
+case 97:
  this.$ = {type: "content", value: $$[$0-2] + $$[$0-1].value + $$[$0] }; 
 break;
-case 97: case 98:
+case 98: case 99:
  this.$ = {type: "content", value: $$[$0-1] + $$[$0] }; 
 break;
-case 101:
+case 102:
  this.$ = {type: 'bool', value: $$[$0] }; 
 break;
-case 102:
+case 103:
  this.$ = {type: "integer", value: $$[$0]}; 
 break;
-case 103:
+case 104:
  this.$ = {type: "decimal", value: + ($$[$0-2] + '.' + $$[$0]) }; 
 break;
-case 104:
+case 105:
  this.$ = {type: "decimal", value: - ($$[$0-2] + '.' + $$[$0]) }; 
 break;
-case 106:
+case 107:
  this.$ = - parseInt($$[$0], 10); 
 break;
-case 107:
+case 108:
  this.$ = {type: 'string', value: $$[$0] }; 
 break;
-case 108:
+case 109:
  this.$ = {type: 'string', value: $$[$0], isEval: true }; 
 break;
-case 109: case 110:
+case 110: case 111:
  this.$ = $$[$0];
 break;
-case 112:
+case 113:
  this.$ = {type: 'array', value: $$[$0-1] }; 
 break;
-case 114:
+case 115:
  this.$ = {type: 'array', value: [] }; 
 break;
-case 115: case 116: case 117: case 118:
+case 116: case 117: case 118: case 119:
  this.$ = {type: 'array', isRange: true, value: [$$[$0-3], $$[$0-1]]}; 
 break;
-case 119:
+case 120:
  this.$ = {type: 'map', value: $$[$0-1] }; 
 break;
-case 120:
+case 121:
  this.$ = {type: 'map'}; 
 break;
-case 121: case 122:
+case 122: case 123:
  this.$ = {}; this.$[$$[$0-2].value] = $$[$0]; 
 break;
-case 123:
+case 124:
  this.$ = {}; this.$[$$[$0-1].value] = $$[$01]; 
 break;
-case 124: case 125:
+case 125: case 126:
  this.$ = $$[$0-4]; this.$[$$[$0-2].value] = $$[$0]; 
 break;
-case 128: case 131:
+case 129: case 132:
  this.$ = $$[$0-1] + $$[$0]; 
 break;
-case 129:
+case 130:
  this.$ = $$[$0-2] + $$[$0-1] + $$[$0]; 
 break;
-case 130:
+case 131:
  this.$ = $$[$0-2] + $$[$0-1]; 
@@ -280,4 +283,4 @@ break;
 },
-table: [{3:1,4:[1,2],5:3,6:4,7:5,8:6,9:7,10:$V0,11:10,12:11,13:12,14:13,15:14,16:15,17:16,18:17,19:$V1,23:19,24:20,33:$V2,34:$V3,79:$V4},{1:[3]},{1:[2,1]},{4:[1,23],6:24,7:5,8:6,9:7,10:$V0,11:10,12:11,13:12,14:13,15:14,16:15,17:16,18:17,19:$V1,23:19,24:20,33:$V2,34:$V3,79:$V4},o($V5,[2,3]),o($V5,[2,5]),o($V5,[2,6]),o($V5,[2,7]),o($V5,[2,8]),{34:$V6,65:25,68:27,69:$V7,70:$V8,79:[1,28]},o($V5,[2,9]),o($V5,[2,10]),o($V5,[2,11]),o($V5,[2,12]),o($V5,[2,13]),o($V5,[2,14]),o($V5,[2,15]),o($V5,[2,16]),{20:[1,31],25:[1,34],27:[1,35],29:[1,36],30:[1,37],31:[1,38],32:[1,39],34:[1,33],37:[1,40],38:[1,41],39:[1,42],79:[1,32]},o($V5,[2,18]),o($V5,[2,19]),o($V5,[2,126]),o($V5,[2,127]),{1:[2,2]},o($V5,[2,4]),{34:[1,43],68:44},o($V9,[2,72],{66:45,73:47,74:48,75:49,76:50,21:$Va,77:$Vb,80:$Vc}),o($V9,[2,74],{73:47,74:48,75:49,76:50,66:53,77:$Vb,80:$Vc}),o($V5,[2,131]),{34:[2,76]},{34:[2,77]},{21:[1,54]},o($V5,[2,128]),{4:[1,56],21:[1,57],79:[1,55]},{21:[1,58]},{21:[1,59]},{21:[1,60]},o($V5,[2,23]),o($V5,[2,24]),{21:[1,61]},o($V5,[2,27]),{21:[1,62]},{21:[1,63]},{21:$Va,66:64,67:65,71:$Vd,72:$Ve,73:47,74:48,75:49,76:50,77:$Vb,80:$Vc},{66:68,67:69,71:$Vd,72:$Ve,73:47,74:48,75:49,76:50,77:$Vb,80:$Vc},o($V9,[2,69],{74:48,75:49,76:50,73:70,77:$Vb,80:$Vc}),{7:74,22:[1,72],33:$Vf,36:75,43:73,47:76,52:$Vg,64:77,70:$Vh,78:71,80:$Vi,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm,90:80},o($Vn,[2,80]),o($Vn,[2,82]),o($Vn,[2,83]),o($Vn,[2,84]),{34:[1,91],68:90,79:[1,92]},{7:94,33:$Vf,52:$Vg,64:93,79:[1,95],81:[1,96],82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},o($V9,[2,71],{74:48,75:49,76:50,73:70,77:$Vb,80:$Vc}),{22:[1,97]},o($V5,[2,129]),o($V5,[2,130]),{7:103,22:[1,99],33:$Vf,36:75,41:98,42:100,43:102,44:[1,101],47:76,52:$Vg,64:77,70:$Vh,80:$Vi,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm,90:80},{7:105,26:104,33:$Vf},{7:113,21:$Vo,28:106,33:$Vf,36:107,47:108,48:109,52:$Vp,62:110,63:$Vq,64:114,70:$Vh,80:$Vi,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm,90:80},{7:113,21:$Vo,28:116,33:$Vf,36:107,47:108,48:109,52:$Vp,62:110,63:$Vq,64:114,70:$Vh,80:$Vi,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm,90:80},{33:[1,117]},{33:[1,118]},{34:[1,119]},{67:120,71:$Vd,72:$Ve,73:70,74:48,75:49,76:50,77:$Vb,80:$Vc},o($V9,[2,73]),o($V9,[2,78]),o($V9,[2,79]),{67:121,71:$Vd,72:$Ve,73:70,74:48,75:49,76:50,77:$Vb,80:$Vc},o($V9,[2,75]),o($Vn,[2,81]),{22:[1,122],45:$Vr},o($Vn,[2,87]),o($Vs,[2,88]),o([22,45],$Vt),o($Vu,[2,109]),o($Vu,[2,110]),o($Vu,[2,111]),{34:$V6,65:25,68:27,69:$V7,70:$V8},{7:127,33:$Vf,36:75,43:73,47:76,52:$Vg,64:77,70:$Vh,78:124,80:$Vi,81:[1,125],82:82,83:83,84:$Vj,85:126,86:$Vk,88:$Vl,89:$Vm,90:80},o($Vu,[2,113]),{72:[1,129],82:130,88:$Vl,89:$Vm,92:128},o($Vv,[2,99]),o($Vv,[2,100]),o($Vv,[2,101]),o($Vw,[2,107]),o($Vw,[2,108]),o($Vv,$Vx),o($Vy,$Vz,{87:[1,131]}),{86:$VA},o($Vn,[2,85]),o($Vn,[2,92],{21:$Va}),o($Vn,[2,93]),{79:[1,134],81:[1,133]},{81:[1,135]},o($Vn,[2,97]),o($Vn,[2,98]),o($V5,[2,17]),{22:[1,136]},o($V5,[2,34]),{22:[2,41],44:[1,137],45:$VB},{7:103,33:$Vf,36:75,42:139,43:102,47:76,52:$Vg,64:77,70:$Vh,80:$Vi,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm,90:80},o($VC,[2,35]),o($VC,[2,36]),{22:[1,140]},{46:[1,141]},{22:[1,142]},{22:[2,46]},{22:[2,47]},{22:[2,48],49:$VD,50:$VE,51:$VF,52:$VG,53:$VH,54:$VI,55:$VJ,56:$VK,57:$VL,58:$VM,59:$VN,60:$VO,61:$VP},o($VQ,[2,62]),{21:$Vo,62:156,86:$VA},{7:113,21:$Vo,33:$Vf,48:157,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},o($VQ,[2,65]),o($VQ,[2,66]),{7:113,21:$Vo,33:$Vf,48:158,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},{22:[1,159]},{34:[1,160]},{34:[1,161]},{7:164,22:[1,163],33:$Vf,40:162},o($V9,[2,68]),o($V9,[2,70]),o($Vn,[2,86]),{7:166,33:$Vf,36:75,43:165,47:76,52:$Vg,64:77,70:$Vh,80:$Vi,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm,90:80},{45:$Vr,81:[1,167]},o($Vu,[2,114]),o($VR,$Vx,{91:[1,168]}),o($VR,$Vt,{91:[1,169]}),{45:[1,171],72:[1,170]},o($Vu,[2,120]),{93:[1,172]},{86:[1,173]},o($Vy,$VS,{87:[1,174]}),o($Vn,[2,94]),o($Vn,[2,96]),o($Vn,[2,95]),o($V5,[2,33]),{7:176,22:[2,44],33:$Vf,36:75,43:175,47:76,52:$Vg,64:77,70:$Vh,80:$Vi,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm,90:80},{7:178,33:$Vf,36:75,43:177,47:76,52:$Vg,64:77,70:$Vh,80:$Vi,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm,90:80},{22:[2,42],44:[1,179],45:$VB},o($V5,[2,20]),{7:113,21:$Vo,28:180,33:$Vf,36:107,47:108,48:109,52:$Vp,62:110,63:$Vq,64:114,70:$Vh,80:$Vi,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm,90:80},o($V5,[2,21]),{7:113,21:$Vo,33:$Vf,48:181,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},{7:113,21:$Vo,33:$Vf,48:182,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},{7:113,21:$Vo,33:$Vf,48:183,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},{7:113,21:$Vo,33:$Vf,48:184,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},{7:113,21:$Vo,33:$Vf,48:185,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},{7:113,21:$Vo,33:$Vf,48:186,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},{7:113,21:$Vo,33:$Vf,48:187,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},{7:113,21:$Vo,33:$Vf,48:188,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},{7:113,21:$Vo,33:$Vf,48:189,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},{7:113,21:$Vo,33:$Vf,48:190,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},{7:113,21:$Vo,33:$Vf,48:191,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},{7:113,21:$Vo,33:$Vf,48:192,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},{7:113,21:$Vo,33:$Vf,48:193,52:$Vp,62:110,63:$Vq,64:114,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm},o($VQ,[2,63]),o($VQ,[2,64]),{22:[1,194],49:$VD,50:$VE,51:$VF,52:$VG,53:$VH,54:$VI,55:$VJ,56:$VK,57:$VL,58:$VM,59:$VN,60:$VO,61:$VP},o($V5,[2,22]),{35:[1,195]},{22:[1,196]},{7:198,22:[1,197],33:$Vf},o($V5,[2,30]),o($VT,[2,31]),o($Vs,[2,90]),o($Vs,[2,91]),o($Vu,[2,112]),{7:200,33:$Vf,52:$VU,85:199,86:$VV},{7:204,33:$Vf,52:$VU,85:203,86:$VV},o($Vu,[2,119]),{82:205,88:$Vl,89:$Vm},o($VW,[2,123],{36:75,47:76,64:77,90:80,82:82,83:83,85:87,43:206,7:207,33:$Vf,52:$Vg,70:$Vh,80:$Vi,84:$Vj,86:$Vk,88:$Vl,89:$Vm}),o($Vv,[2,103]),{86:[1,208]},o($VC,[2,37]),o($VC,[2,40]),o($VC,[2,38]),o($VC,[2,39]),{7:176,22:[2,43],33:$Vf,36:75,43:175,47:76,52:$Vg,64:77,70:$Vh,80:$Vi,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm,90:80},{22:[2,45]},o($VX,[2,49],{51:$VF,52:$VG,53:$VH,54:$VI,55:$VJ,56:$VK,57:$VL,58:$VM,59:$VN,60:$VO,61:$VP}),o($VX,[2,50],{51:$VF,52:$VG,53:$VH,54:$VI,55:$VJ,56:$VK,57:$VL,58:$VM,59:$VN,60:$VO,61:$VP}),o($VY,[2,51],{53:$VH,54:$VI,55:$VJ}),o($VY,[2,52],{53:$VH,54:$VI,55:$VJ}),o($VQ,[2,53]),o($VQ,[2,54]),o($VQ,[2,55]),o($VZ,[2,56],{51:$VF,52:$VG,53:$VH,54:$VI,55:$VJ}),o($VZ,[2,57],{51:$VF,52:$VG,53:$VH,54:$VI,55:$VJ}),o($VZ,[2,58],{51:$VF,52:$VG,53:$VH,54:$VI,55:$VJ}),o($VZ,[2,59],{51:$VF,52:$VG,53:$VH,54:$VI,55:$VJ}),o($VZ,[2,60],{51:$VF,52:$VG,53:$VH,54:$VI,55:$VJ}),o($VZ,[2,61],{51:$VF,52:$VG,53:$VH,54:$VI,55:$VJ}),o($VQ,[2,67]),{7:209,33:$Vf,36:210,80:$Vi,90:80},o($V5,[2,28]),o($V5,[2,29]),o($VT,[2,32]),{81:[1,211]},{81:[1,212]},{81:$Vz},{86:[1,213]},{81:[1,214]},{81:[1,215]},{93:[1,216]},o($VW,[2,121]),o($VW,[2,122]),o($Vv,[2,104]),{22:[1,217]},{22:[1,218]},o($Vu,[2,115]),o($Vu,[2,117]),{81:$VS},o($Vu,[2,116]),o($Vu,[2,118]),{7:219,33:$Vf,36:75,43:220,47:76,52:$Vg,64:77,70:$Vh,80:$Vi,82:82,83:83,84:$Vj,85:87,86:$Vk,88:$Vl,89:$Vm,90:80},o($V5,[2,25]),o($V5,[2,26]),o($VW,[2,124]),o($VW,[2,125])],
-defaultActions: {2:[2,1],23:[2,2],29:[2,76],30:[2,77],107:[2,46],108:[2,47],180:[2,45],201:[2,105],213:[2,106]},
+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,66:26,69:28,70:$V8,71:$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],38:[1,41],39:[1,42],40:[1,43],80:[1,33]},o($V6,[2,19]),o($V6,[2,20]),o($V6,[2,127]),o($V6,[2,128]),{1:[2,2]},o($V6,[2,4]),{35:[1,44],69:45},o($Va,[2,73],{67:46,74:48,75:49,76:50,77:51,22:$Vb,78:$Vc,81:$Vd}),o($Va,[2,75],{74:48,75:49,76:50,77:51,67:54,78:$Vc,81:$Vd}),o($V6,[2,132]),{35:[2,77]},{35:[2,78]},{22:[1,55]},o($V6,[2,129]),{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,28]),{22:[1,63]},{22:[1,64]},{22:$Vb,67:65,68:66,72:$Ve,73:$Vf,74:48,75:49,76:50,77:51,78:$Vc,81:$Vd},{67:69,68:70,72:$Ve,73:$Vf,74:48,75:49,76:50,77:51,78:$Vc,81:$Vd},o($Va,[2,70],{75:49,76:50,77:51,74:71,78:$Vc,81:$Vd}),{7:75,23:[1,73],34:$Vg,37:76,44:74,48:77,53:$Vh,65:78,71:$Vi,79:72,81:$Vj,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn,91:81},o($Vo,[2,81]),o($Vo,[2,83]),o($Vo,[2,84]),o($Vo,[2,85]),{35:[1,92],69:91,80:[1,93]},{7:95,34:$Vg,53:$Vh,65:94,80:[1,96],82:[1,97],83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},o($Va,[2,72],{75:49,76:50,77:51,74:71,78:$Vc,81:$Vd}),{23:[1,98]},o($V6,[2,130]),o($V6,[2,131]),{7:104,23:[1,100],34:$Vg,37:76,42:99,43:101,44:103,45:[1,102],48:77,53:$Vh,65:78,71:$Vi,81:$Vj,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn,91:81},{7:106,27:105,34:$Vg},{7:114,22:$Vp,29:107,34:$Vg,37:108,48:109,49:110,53:$Vq,63:111,64:$Vr,65:115,71:$Vi,81:$Vj,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn,91:81},{7:114,22:$Vp,29:117,34:$Vg,37:108,48:109,49:110,53:$Vq,63:111,64:$Vr,65:115,71:$Vi,81:$Vj,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn,91:81},{34:[1,118]},{34:[1,119]},{35:[1,120]},{68:121,72:$Ve,73:$Vf,74:71,75:49,76:50,77:51,78:$Vc,81:$Vd},o($Va,[2,74]),o($Va,[2,79]),o($Va,[2,80]),{68:122,72:$Ve,73:$Vf,74:71,75:49,76:50,77:51,78:$Vc,81:$Vd},o($Va,[2,76]),o($Vo,[2,82]),{23:[1,123],46:$Vs},o($Vo,[2,88]),o($Vt,[2,89]),o([23,46],$Vu),o($Vv,[2,110]),o($Vv,[2,111]),o($Vv,[2,112]),{35:$V7,66:26,69:28,70:$V8,71:$V9},{7:128,34:$Vg,37:76,44:74,48:77,53:$Vh,65:78,71:$Vi,79:125,81:$Vj,82:[1,126],83:83,84:84,85:$Vk,86:127,87:$Vl,89:$Vm,90:$Vn,91:81},o($Vv,[2,114]),{73:[1,130],83:131,89:$Vm,90:$Vn,93:129},o($Vw,[2,100]),o($Vw,[2,101]),o($Vw,[2,102]),o($Vx,[2,108]),o($Vx,[2,109]),o($Vw,$Vy),o($Vz,$VA,{88:[1,132]}),{87:$VB},o($Vo,[2,86]),o($Vo,[2,93],{22:$Vb}),o($Vo,[2,94]),{80:[1,135],82:[1,134]},{82:[1,136]},o($Vo,[2,98]),o($Vo,[2,99]),o($V6,[2,18]),{23:[1,137]},o($V6,[2,35]),{23:[2,42],45:[1,138],46:$VC},{7:104,34:$Vg,37:76,43:140,44:103,48:77,53:$Vh,65:78,71:$Vi,81:$Vj,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn,91:81},o($VD,[2,36]),o($VD,[2,37]),{23:[1,141]},{47:[1,142]},{23:[1,143]},{23:[2,47]},{23:[2,48]},{23:[2,49],50:$VE,51:$VF,52:$VG,53:$VH,54:$VI,55:$VJ,56:$VK,57:$VL,58:$VM,59:$VN,60:$VO,61:$VP,62:$VQ},o($VR,[2,63]),{22:$Vp,63:157,87:$VB},{7:114,22:$Vp,34:$Vg,49:158,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},o($VR,[2,66]),o($VR,[2,67]),{7:114,22:$Vp,34:$Vg,49:159,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},{23:[1,160]},{35:[1,161]},{35:[1,162]},{7:165,23:[1,164],34:$Vg,41:163},o($Va,[2,69]),o($Va,[2,71]),o($Vo,[2,87]),{7:167,34:$Vg,37:76,44:166,48:77,53:$Vh,65:78,71:$Vi,81:$Vj,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn,91:81},{46:$Vs,82:[1,168]},o($Vv,[2,115]),o($VS,$Vy,{92:[1,169]}),o($VS,$Vu,{92:[1,170]}),{46:[1,172],73:[1,171]},o($Vv,[2,121]),{94:[1,173]},{87:[1,174]},o($Vz,$VT,{88:[1,175]}),o($Vo,[2,95]),o($Vo,[2,97]),o($Vo,[2,96]),o($V6,[2,34]),{7:177,23:[2,45],34:$Vg,37:76,44:176,48:77,53:$Vh,65:78,71:$Vi,81:$Vj,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn,91:81},{7:179,34:$Vg,37:76,44:178,48:77,53:$Vh,65:78,71:$Vi,81:$Vj,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn,91:81},{23:[2,43],45:[1,180],46:$VC},o($V6,[2,21]),{7:114,22:$Vp,29:181,34:$Vg,37:108,48:109,49:110,53:$Vq,63:111,64:$Vr,65:115,71:$Vi,81:$Vj,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn,91:81},o($V6,[2,22]),{7:114,22:$Vp,34:$Vg,49:182,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},{7:114,22:$Vp,34:$Vg,49:183,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},{7:114,22:$Vp,34:$Vg,49:184,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},{7:114,22:$Vp,34:$Vg,49:185,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},{7:114,22:$Vp,34:$Vg,49:186,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},{7:114,22:$Vp,34:$Vg,49:187,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},{7:114,22:$Vp,34:$Vg,49:188,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},{7:114,22:$Vp,34:$Vg,49:189,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},{7:114,22:$Vp,34:$Vg,49:190,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},{7:114,22:$Vp,34:$Vg,49:191,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},{7:114,22:$Vp,34:$Vg,49:192,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},{7:114,22:$Vp,34:$Vg,49:193,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},{7:114,22:$Vp,34:$Vg,49:194,53:$Vq,63:111,64:$Vr,65:115,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn},o($VR,[2,64]),o($VR,[2,65]),{23:[1,195],50:$VE,51:$VF,52:$VG,53:$VH,54:$VI,55:$VJ,56:$VK,57:$VL,58:$VM,59:$VN,60:$VO,61:$VP,62:$VQ},o($V6,[2,23]),{36:[1,196]},{23:[1,197]},{7:199,23:[1,198],34:$Vg},o($V6,[2,31]),o($VU,[2,32]),o($Vt,[2,91]),o($Vt,[2,92]),o($Vv,[2,113]),{7:201,34:$Vg,53:$VV,86:200,87:$VW},{7:205,34:$Vg,53:$VV,86:204,87:$VW},o($Vv,[2,120]),{83:206,89:$Vm,90:$Vn},o($VX,[2,124],{37:76,48:77,65:78,91:81,83:83,84:84,86:88,44:207,7:208,34:$Vg,53:$Vh,71:$Vi,81:$Vj,85:$Vk,87:$Vl,89:$Vm,90:$Vn}),o($Vw,[2,104]),{87:[1,209]},o($VD,[2,38]),o($VD,[2,41]),o($VD,[2,39]),o($VD,[2,40]),{7:177,23:[2,44],34:$Vg,37:76,44:176,48:77,53:$Vh,65:78,71:$Vi,81:$Vj,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn,91:81},{23:[2,46]},o($VY,[2,50],{52:$VG,53:$VH,54:$VI,55:$VJ,56:$VK,57:$VL,58:$VM,59:$VN,60:$VO,61:$VP,62:$VQ}),o($VY,[2,51],{52:$VG,53:$VH,54:$VI,55:$VJ,56:$VK,57:$VL,58:$VM,59:$VN,60:$VO,61:$VP,62:$VQ}),o($VZ,[2,52],{54:$VI,55:$VJ,56:$VK}),o($VZ,[2,53],{54:$VI,55:$VJ,56:$VK}),o($VR,[2,54]),o($VR,[2,55]),o($VR,[2,56]),o($V_,[2,57],{52:$VG,53:$VH,54:$VI,55:$VJ,56:$VK}),o($V_,[2,58],{52:$VG,53:$VH,54:$VI,55:$VJ,56:$VK}),o($V_,[2,59],{52:$VG,53:$VH,54:$VI,55:$VJ,56:$VK}),o($V_,[2,60],{52:$VG,53:$VH,54:$VI,55:$VJ,56:$VK}),o($V_,[2,61],{52:$VG,53:$VH,54:$VI,55:$VJ,56:$VK}),o($V_,[2,62],{52:$VG,53:$VH,54:$VI,55:$VJ,56:$VK}),o($VR,[2,68]),{7:210,34:$Vg,37:211,81:$Vj,91:81},o($V6,[2,29]),o($V6,[2,30]),o($VU,[2,33]),{82:[1,212]},{82:[1,213]},{82:$VA},{87:[1,214]},{82:[1,215]},{82:[1,216]},{94:[1,217]},o($VX,[2,122]),o($VX,[2,123]),o($Vw,[2,105]),{23:[1,218]},{23:[1,219]},o($Vv,[2,116]),o($Vv,[2,118]),{82:$VT},o($Vv,[2,117]),o($Vv,[2,119]),{7:220,34:$Vg,37:76,44:221,48:77,53:$Vh,65:78,71:$Vi,81:$Vj,83:83,84:84,85:$Vk,86:88,87:$Vl,89:$Vm,90:$Vn,91:81},o($V6,[2,26]),o($V6,[2,27]),o($VX,[2,125]),o($VX,[2,126])],
+defaultActions: {2:[2,1],24:[2,2],30:[2,77],31:[2,78],108:[2,47],109:[2,48],181:[2,46],202:[2,106],214:[2,107]},
 parseError: function parseError(str, hash) {
@@ -767,3 +770,3 @@ if (hash.recoverable) {
                                     if (_num > 1) yy_.yytext = yy_.yytext.replace(/(\\\\)+$/, '\\');
-                                    if(yy_.yytext) return 79; 
+                                    if(yy_.yytext) return 80; 
                                   
@@ -782,38 +785,38 @@ break;
                                     if (_num > 1) yy_.yytext = yy_.yytext.replace(/(\\\\)+$/, '\\');
-                                    if(yy_.yytext) return 79; 
+                                    if(yy_.yytext) return 80; 
                                   
 break;
-case 2: return 79; 
+case 2: return 80; 
 break;
-case 3: this.popState(); return 10; 
+case 3: this.popState(); return 11; 
 break;
-case 4: this.popState(); yy_.yytext = yy_.yytext.replace(/^#\[\[|\]\]#$/g, ''); return 79
+case 4: this.popState(); yy_.yytext = yy_.yytext.replace(/^#\[\[|\]\]#$/g, ''); return 10
 break;
-case 5: this.popState(); return 10; 
+case 5: this.popState(); return 11; 
 break;
-case 6: return 19; 
+case 6: return 20; 
 break;
-case 7: return 25; 
+case 7: return 26; 
 break;
-case 8: return 27; 
+case 8: return 28; 
 break;
-case 9: return 29; 
+case 9: return 30; 
 break;
-case 10: this.popState(); return 30; 
+case 10: this.popState(); return 31; 
 break;
-case 11: this.popState(); return 30; 
+case 11: this.popState(); return 31; 
 break;
-case 12: this.popState(); return 31; 
+case 12: this.popState(); return 32; 
 break;
-case 13: this.popState(); return 37; 
+case 13: this.popState(); return 38; 
 break;
-case 14: return 32; 
+case 14: return 33; 
 break;
-case 15: return 20; 
+case 15: return 21; 
 break;
-case 16: return 38; 
+case 16: return 39; 
 break;
-case 17: return 39; 
+case 17: return 40; 
 break;
-case 18: return 35; 
+case 18: return 36; 
 break;
@@ -836,9 +839,9 @@ case 19: return yy_.yytext;
 break;
-case 27: return 33; 
+case 27: return 34; 
 break;
-case 28: return 33; 
+case 28: return 34; 
 break;
 case 29: return yy_.yytext; 
 break;
-case 30: return 46; 
+case 30: return 47; 
 break;
@@ -848,3 +851,3 @@ case 31:
                                     if (len >= 2 && this.topState() === 'c' && this.topState(1) === 'run') {
-                                      return 44;
+                                      return 45;
                                     }
@@ -855,13 +858,13 @@
 break;
-case 33: return 70; 
+case 33: return 71; 
 break;
-case 34: return 72; 
+case 34: return 73; 
 break;
-case 35: return 93; 
+case 35: return 94; 
 break;
-case 36: yy.begin = true; return 69; 
+case 36: yy.begin = true; return 70; 
 break;
-case 37: this.popState(); if (yy.begin === true) { yy.begin = false; return 71;} else { return 79; } 
+case 37: this.popState(); if (yy.begin === true) { yy.begin = false; return 72;} else { return 80; } 
 break;
-case 38: this.begin("c"); return 21; 
+case 38: this.begin("c"); return 22; 
 break;
@@ -887,49 +890,49 @@ case 39:
 
-                                      return 22; 
+                                      return 23; 
                                     } else {
-                                      return 79; 
+                                      return 80; 
                                     }
                                   
 break;
-case 40: this.begin("i"); return 80; 
+case 40: this.begin("i"); return 81; 
 break;
 case 41: 
                                     if (this.popState() === "i") {
-                                      return 81; 
+                                      return 82; 
                                     } else {
-                                      return 79;
+                                      return 80;
                                     }
                                   
 break;
-case 42: return 91; 
+case 42: return 92; 
 break;
-case 43: return 77; 
+case 43: return 78; 
 break;
-case 44: return 87; 
+case 44: return 88; 
 break;
-case 45: return 45; 
+case 45: return 46; 
 break;
-case 46: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2).replace(/\\"/g,'"'); return 89; 
+case 46: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2).replace(/\\"/g,'"'); return 90; 
 break;
-case 47: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2).replace(/\\'/g,"'"); return 88; 
+case 47: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2).replace(/\\'/g,"'"); return 89; 
 break;
-case 48: return 84; 
+case 48: return 85; 
 break;
-case 49: return 84; 
+case 49: return 85; 
 break;
-case 50: return 84; 
+case 50: return 85; 
 break;
-case 51: return 86; 
+case 51: return 87; 
 break;
-case 52: return 34; 
+case 52: return 35; 
 break;
-case 53: this.begin("run"); return 34; 
+case 53: this.begin("run"); return 35; 
 break;
-case 54: this.begin('h'); return 19; 
+case 54: this.begin('h'); return 20; 
 break;
-case 55: this.popState(); return 79; 
+case 55: this.popState(); return 80; 
 break;
-case 56: this.popState(); return 79; 
+case 56: this.popState(); return 80; 
 break;
-case 57: this.popState(); return 79; 
+case 57: this.popState(); return 80; 
 break;
@@ -971,2 +974,2 @@ case 58: this.popState(); return 4;
 }
-}
+}

tests/compile.js

@@ -792,3 +792,12 @@ 'use strict';
   })
+
+  describe('raw content render', function() {
+    it('simple', function() {
+      var vm = '#[[\nThis content is ignored. $val\n]]#';
+      assert.equal('\nThis content is ignored. $val\n', render(vm, {
+        val: 'foo'
+      }));
+    });
+  });
 })
 

tests/parse.js

@@ -222,2 +222,11 @@ 'use strict';
 
+  describe('raw identify', function() {
+    it('raw content', function() {
+      var asts = parse('#[[\nThis content is ignored.\n]]#');
+
+      assert.equal('raw', asts[0].type);
+      assert.equal('\nThis content is ignored.\n', asts[0].value);
+    });
+  });
+
 })

No alert changes

Improved metrics

Total package byte prevSize

1383621

increased by0.06%

Lines of code

5531

increased by0.4%

No dependency changes