diff --git a/package.json b/package.json index 01cdc8a..6d4fd98 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,6 @@ "eslint": "^5.0.1", "eslint-plugin-mocha": "^5.0.0", "jison": "^0.4.18", - "snarkjs": "0.1.6" + "snarkjs": "0.1.7" } } diff --git a/parser/jaz.jison b/parser/jaz.jison index 40ee3a4..7fd7089 100644 --- a/parser/jaz.jison +++ b/parser/jaz.jison @@ -78,6 +78,7 @@ include { return 'include'; } \- { return '-'; } \* { return '*'; } \/ { return '/'; } +\\ { return '\\'; } \% { return '%'; } \^ { return '^'; } \& { return '&'; } @@ -118,7 +119,7 @@ include { return 'include'; } %left '<<' '>>' %left '+' '-' -%left '*' '/' '%' +%left '*' '/' '\\' '%' %left '**' %right '++' '--' UMINUS UPLUS '!' '~' %left '.' @@ -627,7 +628,7 @@ e7 { if (($1.type == "NUMBER") && ($3.type == "NUMBER")) { let v = $3.value.greater(256) ? 256 : $3.value.value; - $$ = {t1ype: "NUMBER", value: $1.value.shiftRight(v).and(__MASK__) }; + $$ = {type: "NUMBER", value: $1.value.shiftRight(v).and(__MASK__) }; } else { $$ = { type: "OP", op: ">>", values: [$1, $3] }; } @@ -684,6 +685,15 @@ e5 } setLines($$, @1, @3); } + | e5 '\\' e4 + { + if (($1.type == "NUMBER") && ($3.type == "NUMBER")) { + $$ = { type: "NUMBER", value: ($1.value.divide($3.value)) }; + } else { + $$ = { type: "OP", op: "\\", values: [$1, $3] }; + } + setLines($$, @1, @3); + } | e5 '%' e4 { if (($1.type == "NUMBER") && ($3.type == "NUMBER")) { diff --git a/parser/jaz.js b/parser/jaz.js index c965de9..60c32fa 100644 --- a/parser/jaz.js +++ b/parser/jaz.js @@ -72,12 +72,12 @@ } */ var jaz = (function(){ -var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,14],$V1=[1,31],$V2=[1,59],$V3=[1,15],$V4=[1,16],$V5=[1,17],$V6=[1,18],$V7=[1,19],$V8=[1,20],$V9=[1,23],$Va=[1,21],$Vb=[1,50],$Vc=[1,51],$Vd=[1,48],$Ve=[1,49],$Vf=[1,52],$Vg=[1,53],$Vh=[1,57],$Vi=[1,58],$Vj=[1,32],$Vk=[1,33],$Vl=[1,34],$Vm=[1,37],$Vn=[5,17,18,19,22,24,27,29,30,31,32,34,35,80,82,89,90,91,92,96,97,101,102,106,109],$Vo=[5,17,18,19,22,24,26,27,29,30,31,32,34,35,80,82,89,90,91,92,96,97,101,102,106,109],$Vp=[1,72],$Vq=[1,73],$Vr=[1,74],$Vs=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,83,85,86,87,91,92,96,97,101,102,106,109,110],$Vt=[2,94],$Vu=[1,88],$Vv=[1,89],$Vw=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,55,56,80,82,89,90,91,92,96,97,101,102,106,109,110],$Vx=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,83,85,86,87,89,90,91,92,96,97,101,102,106,110],$Vy=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,80,82,89,90,91,92,96,97,101,102,106,109,110],$Vz=[2,108],$VA=[1,96],$VB=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,80,82,89,90,91,92,96,97,101,102,106,109,110],$VC=[1,102],$VD=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,80,82,89,90,91,92,96,97,101,102,106,109,110],$VE=[1,105],$VF=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,80,82,89,90,91,92,96,97,101,102,106,109,110],$VG=[1,106],$VH=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,80,82,89,90,91,92,96,97,101,102,106,109,110],$VI=[1,107],$VJ=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,80,82,89,90,91,92,96,97,101,102,106,109,110],$VK=[1,108],$VL=[1,109],$VM=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,69,71,80,82,89,90,91,92,96,97,101,102,106,109,110],$VN=[1,110],$VO=[1,111],$VP=[1,112],$VQ=[1,113],$VR=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,80,82,89,90,91,92,96,97,101,102,106,109,110],$VS=[1,114],$VT=[1,115],$VU=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,89,90,91,92,96,97,101,102,106,109,110],$VV=[1,116],$VW=[1,117],$VX=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,89,90,91,92,96,97,101,102,106,109,110],$VY=[1,118],$VZ=[1,119],$V_=[1,120],$V$=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,83,85,86,89,90,91,92,96,97,101,102,106,109,110],$V01=[1,121],$V11=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,83,85,86,87,89,90,91,92,96,97,101,102,106,109,110],$V21=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,83,85,86,87,89,90,91,92,96,97,99,101,102,106,109,110],$V31=[1,165],$V41=[21,23,110],$V51=[1,186],$V61=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,56,80,82,89,90,91,92,96,97,101,102,106,109,110],$V71=[1,198],$V81=[21,23]; +var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,14],$V1=[1,31],$V2=[1,59],$V3=[1,15],$V4=[1,16],$V5=[1,17],$V6=[1,18],$V7=[1,19],$V8=[1,20],$V9=[1,23],$Va=[1,21],$Vb=[1,50],$Vc=[1,51],$Vd=[1,48],$Ve=[1,49],$Vf=[1,52],$Vg=[1,53],$Vh=[1,57],$Vi=[1,58],$Vj=[1,32],$Vk=[1,33],$Vl=[1,34],$Vm=[1,37],$Vn=[5,17,18,19,22,24,27,29,30,31,32,34,35,80,82,90,91,92,93,97,98,102,103,107,110],$Vo=[5,17,18,19,22,24,26,27,29,30,31,32,34,35,80,82,90,91,92,93,97,98,102,103,107,110],$Vp=[1,72],$Vq=[1,73],$Vr=[1,74],$Vs=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,83,85,86,87,88,92,93,97,98,102,103,107,110,111],$Vt=[2,95],$Vu=[1,88],$Vv=[1,89],$Vw=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,55,56,80,82,90,91,92,93,97,98,102,103,107,110,111],$Vx=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,83,85,86,87,88,90,91,92,93,97,98,102,103,107,111],$Vy=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,80,82,90,91,92,93,97,98,102,103,107,110,111],$Vz=[2,109],$VA=[1,96],$VB=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,80,82,90,91,92,93,97,98,102,103,107,110,111],$VC=[1,102],$VD=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,80,82,90,91,92,93,97,98,102,103,107,110,111],$VE=[1,105],$VF=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,80,82,90,91,92,93,97,98,102,103,107,110,111],$VG=[1,106],$VH=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,80,82,90,91,92,93,97,98,102,103,107,110,111],$VI=[1,107],$VJ=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,80,82,90,91,92,93,97,98,102,103,107,110,111],$VK=[1,108],$VL=[1,109],$VM=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,69,71,80,82,90,91,92,93,97,98,102,103,107,110,111],$VN=[1,110],$VO=[1,111],$VP=[1,112],$VQ=[1,113],$VR=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,80,82,90,91,92,93,97,98,102,103,107,110,111],$VS=[1,114],$VT=[1,115],$VU=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,90,91,92,93,97,98,102,103,107,110,111],$VV=[1,116],$VW=[1,117],$VX=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,90,91,92,93,97,98,102,103,107,110,111],$VY=[1,118],$VZ=[1,119],$V_=[1,120],$V$=[1,121],$V01=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,83,85,86,87,90,91,92,93,97,98,102,103,107,110,111],$V11=[1,122],$V21=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,50,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,83,85,86,87,88,90,91,92,93,97,98,102,103,107,110,111],$V31=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,83,85,86,87,88,90,91,92,93,97,98,100,102,103,107,110,111],$V41=[1,166],$V51=[21,23,111],$V61=[1,188],$V71=[5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,56,80,82,90,91,92,93,97,98,102,103,107,110,111],$V81=[1,200],$V91=[21,23]; var parser = {trace: function trace () { }, yy: {}, -symbols_: {"error":2,"allStatments":3,"statmentList":4,"EOF":5,"statment":6,"functionDefinitionStatment":7,"templateDefinitionStatment":8,"ifStatment":9,"forStatment":10,"whileStatment":11,"doWhileStatment":12,"returnStatment":13,"block":14,"expressionStatment":15,"includeStatment":16,"function":17,"IDENTIFIER":18,"(":19,"identifierList":20,")":21,"template":22,",":23,"if":24,"expression":25,"else":26,"for":27,";":28,"while":29,"do":30,"return":31,"include":32,"STRING":33,"{":34,"}":35,"e17":36,"leftHandExpression":37,"=":38,"+=":39,"-=":40,"*=":41,"/=":42,"%=":43,"<<=":44,">>=":45,"&=":46,"|=":47,"^=":48,"<==":49,"==>":50,"<--":51,"-->":52,"e16":53,"===":54,"?":55,":":56,"rightArray":57,"e15":58,"||":59,"e14":60,"&&":61,"e13":62,"|":63,"e12":64,"^":65,"e11":66,"&":67,"e10":68,"==":69,"e9":70,"!=":71,"<=":72,"e7":73,">=":74,"<":75,">":76,"<<":77,"e6":78,">>":79,"+":80,"e5":81,"-":82,"*":83,"e4":84,"/":85,"%":86,"**":87,"e3":88,"++":89,"--":90,"!":91,"~":92,"e2":93,"functionCall":94,"e0":95,"DECNUMBER":96,"HEXNUMBER":97,"simpleLeftHandExpression":98,".":99,"declaration":100,"var":101,"signal":102,"input":103,"private":104,"output":105,"component":106,"array":107,"expressionList":108,"[":109,"]":110,"$accept":0,"$end":1}, -terminals_: {2:"error",5:"EOF",17:"function",18:"IDENTIFIER",19:"(",21:")",22:"template",23:",",24:"if",26:"else",27:"for",28:";",29:"while",30:"do",31:"return",32:"include",33:"STRING",34:"{",35:"}",38:"=",39:"+=",40:"-=",41:"*=",42:"/=",43:"%=",44:"<<=",45:">>=",46:"&=",47:"|=",48:"^=",49:"<==",50:"==>",51:"<--",52:"-->",54:"===",55:"?",56:":",59:"||",61:"&&",63:"|",65:"^",67:"&",69:"==",71:"!=",72:"<=",74:">=",75:"<",76:">",77:"<<",79:">>",80:"+",82:"-",83:"*",85:"/",86:"%",87:"**",89:"++",90:"--",91:"!",92:"~",96:"DECNUMBER",97:"HEXNUMBER",99:".",101:"var",102:"signal",103:"input",104:"private",105:"output",106:"component",109:"[",110:"]"}, -productions_: [0,[3,2],[4,2],[4,1],[6,1],[6,1],[6,1],[6,1],[6,1],[6,1],[6,1],[6,1],[6,1],[6,1],[7,6],[7,5],[8,6],[8,5],[20,3],[20,1],[9,7],[9,5],[10,9],[11,5],[12,6],[13,3],[13,2],[16,3],[16,2],[14,3],[15,2],[15,1],[25,1],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,5],[36,1],[53,1],[53,1],[58,3],[58,1],[60,3],[60,1],[62,3],[62,1],[64,3],[64,1],[66,3],[66,1],[68,3],[68,3],[68,1],[70,3],[70,3],[70,3],[70,3],[70,1],[73,3],[73,3],[73,1],[78,3],[78,3],[78,1],[81,3],[81,3],[81,3],[81,1],[84,3],[84,1],[88,2],[88,2],[88,2],[88,2],[88,2],[88,2],[88,1],[93,2],[93,2],[93,1],[93,1],[95,1],[95,1],[95,1],[95,3],[37,3],[37,1],[37,1],[100,2],[100,2],[100,3],[100,4],[100,3],[100,2],[98,2],[98,1],[94,4],[94,3],[108,3],[108,1],[57,1],[107,3]], +symbols_: {"error":2,"allStatments":3,"statmentList":4,"EOF":5,"statment":6,"functionDefinitionStatment":7,"templateDefinitionStatment":8,"ifStatment":9,"forStatment":10,"whileStatment":11,"doWhileStatment":12,"returnStatment":13,"block":14,"expressionStatment":15,"includeStatment":16,"function":17,"IDENTIFIER":18,"(":19,"identifierList":20,")":21,"template":22,",":23,"if":24,"expression":25,"else":26,"for":27,";":28,"while":29,"do":30,"return":31,"include":32,"STRING":33,"{":34,"}":35,"e17":36,"leftHandExpression":37,"=":38,"+=":39,"-=":40,"*=":41,"/=":42,"%=":43,"<<=":44,">>=":45,"&=":46,"|=":47,"^=":48,"<==":49,"==>":50,"<--":51,"-->":52,"e16":53,"===":54,"?":55,":":56,"rightArray":57,"e15":58,"||":59,"e14":60,"&&":61,"e13":62,"|":63,"e12":64,"^":65,"e11":66,"&":67,"e10":68,"==":69,"e9":70,"!=":71,"<=":72,"e7":73,">=":74,"<":75,">":76,"<<":77,"e6":78,">>":79,"+":80,"e5":81,"-":82,"*":83,"e4":84,"/":85,"\\\\":86,"%":87,"**":88,"e3":89,"++":90,"--":91,"!":92,"~":93,"e2":94,"functionCall":95,"e0":96,"DECNUMBER":97,"HEXNUMBER":98,"simpleLeftHandExpression":99,".":100,"declaration":101,"var":102,"signal":103,"input":104,"private":105,"output":106,"component":107,"array":108,"expressionList":109,"[":110,"]":111,"$accept":0,"$end":1}, +terminals_: {2:"error",5:"EOF",17:"function",18:"IDENTIFIER",19:"(",21:")",22:"template",23:",",24:"if",26:"else",27:"for",28:";",29:"while",30:"do",31:"return",32:"include",33:"STRING",34:"{",35:"}",38:"=",39:"+=",40:"-=",41:"*=",42:"/=",43:"%=",44:"<<=",45:">>=",46:"&=",47:"|=",48:"^=",49:"<==",50:"==>",51:"<--",52:"-->",54:"===",55:"?",56:":",59:"||",61:"&&",63:"|",65:"^",67:"&",69:"==",71:"!=",72:"<=",74:">=",75:"<",76:">",77:"<<",79:">>",80:"+",82:"-",83:"*",85:"/",86:"\\\\",87:"%",88:"**",90:"++",91:"--",92:"!",93:"~",97:"DECNUMBER",98:"HEXNUMBER",100:".",102:"var",103:"signal",104:"input",105:"private",106:"output",107:"component",110:"[",111:"]"}, +productions_: [0,[3,2],[4,2],[4,1],[6,1],[6,1],[6,1],[6,1],[6,1],[6,1],[6,1],[6,1],[6,1],[6,1],[7,6],[7,5],[8,6],[8,5],[20,3],[20,1],[9,7],[9,5],[10,9],[11,5],[12,6],[13,3],[13,2],[16,3],[16,2],[14,3],[15,2],[15,1],[25,1],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,3],[36,5],[36,1],[53,1],[53,1],[58,3],[58,1],[60,3],[60,1],[62,3],[62,1],[64,3],[64,1],[66,3],[66,1],[68,3],[68,3],[68,1],[70,3],[70,3],[70,3],[70,3],[70,1],[73,3],[73,3],[73,1],[78,3],[78,3],[78,1],[81,3],[81,3],[81,3],[81,3],[81,1],[84,3],[84,1],[89,2],[89,2],[89,2],[89,2],[89,2],[89,2],[89,1],[94,2],[94,2],[94,1],[94,1],[96,1],[96,1],[96,1],[96,3],[37,3],[37,1],[37,1],[101,2],[101,2],[101,3],[101,4],[101,3],[101,2],[99,2],[99,1],[95,4],[95,3],[109,3],[109,1],[57,1],[108,3]], performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) { /* this == yyval */ @@ -103,7 +103,7 @@ case 3: setLines(this.$, _$[$0]); break; -case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 11: case 12: case 13: case 31: case 32: case 60: case 62: case 76: case 80: case 82: case 89: case 92: case 93: case 113: +case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 11: case 12: case 13: case 31: case 32: case 60: case 62: case 76: case 81: case 83: case 90: case 93: case 94: case 114: this.$ = $$[$0]; @@ -458,7 +458,7 @@ case 72: if (($$[$0-2].type == "NUMBER") && ($$[$0].type == "NUMBER")) { let v = $$[$0].value.greater(256) ? 256 : $$[$0].value.value; - this.$ = {t1ype: "NUMBER", value: $$[$0-2].value.shiftRight(v).and(__MASK__) }; + this.$ = {type: "NUMBER", value: $$[$0-2].value.shiftRight(v).and(__MASK__) }; } else { this.$ = { type: "OP", op: ">>", values: [$$[$0-2], $$[$0]] }; } @@ -512,6 +512,16 @@ case 78: break; case 79: + if (($$[$0-2].type == "NUMBER") && ($$[$0].type == "NUMBER")) { + this.$ = { type: "NUMBER", value: ($$[$0-2].value.divide($$[$0].value)) }; + } else { + this.$ = { type: "OP", op: "\\", values: [$$[$0-2], $$[$0]] }; + } + setLines(this.$, _$[$0-2], _$[$0]); + +break; +case 80: + if (($$[$0-2].type == "NUMBER") && ($$[$0].type == "NUMBER")) { this.$ = { type: "NUMBER", value: $$[$0-2].value.mod($$[$0].value) }; } else { @@ -520,7 +530,7 @@ case 79: setLines(this.$, _$[$0-2], _$[$0]); break; -case 81: +case 82: if (($$[$0-2].type == "NUMBER") && ($$[$0].type == "NUMBER")) { this.$ = { type: "NUMBER", value: $$[$0-2].value.modPow($$[$0].value, __P__) }; @@ -530,25 +540,25 @@ case 81: setLines(this.$, _$[$0-2], _$[$0]); break; -case 83: +case 84: this.$ = { type: "OP", op: "PLUSPLUSLEFT", values: [$$[$0]] }; setLines(this.$, _$[$0-1], _$[$0]); break; -case 84: +case 85: this.$ = { type: "OP", op: "MINUSMINUSLEFT", values: [$$[$0]] }; setLines(this.$, _$[$0-1], _$[$0]); break; -case 85: +case 86: this.$ = $$[$0]; setLines(this.$, _$[$0-1], _$[$0]); break; -case 86: +case 87: if ($$[$0].type == "NUMBER") { this.$ = { type: "NUMBER", value: __P__.minus($$[$0].value).mod(__P__) }; @@ -558,7 +568,7 @@ case 86: setLines(this.$, _$[$0-1], _$[$0]); break; -case 87: +case 88: if ($$[$0].type == "NUMBER") { this.$ = { type: "NUMBER", value: $$[$0].value.eq(0) ? bigInt(1) : bigInt(0) }; @@ -568,7 +578,7 @@ case 87: setLines(this.$, _$[$0-1], _$[$0]); break; -case 88: +case 89: if ($$[$0].type == "NUMBER") { this.$ = { type: "NUMBER", value: $$[$0].value.xor(__MASK__) }; @@ -578,84 +588,84 @@ case 88: setLines(this.$, _$[$0-1], _$[$0]); break; -case 90: +case 91: this.$ = {type: "OP", op: "PLUSPLUSRIGHT", values: [$$[$0-1]] }; setLines(this.$, _$[$0-1], _$[$0]); break; -case 91: +case 92: this.$ = {type: "OP", op: "MINUSMINUSRIGHT", values: [$$[$0-1]] }; setLines(this.$, _$[$0-1], _$[$0]); break; -case 94: case 99: case 100: +case 95: case 100: case 101: this.$ = $$[$0] break; -case 95: +case 96: this.$ = {type: "NUMBER", value: bigInt($$[$0]).mod(__P__) } setLines(this.$, _$[$0]); break; -case 96: +case 97: this.$ = {type: "NUMBER", value: bigInt($$[$0].substr(2).toUpperCase(), 16).mod(__P__) } setLines(this.$, _$[$0]); break; -case 97: +case 98: this.$ = $$[$0-1]; setLines(this.$, _$[$0-2], _$[$0]); break; -case 98: +case 99: this.$ = {type: "PIN", component: $$[$0-2], pin: $$[$0] }; setLines(this.$, _$[$0-2], _$[$0]); break; -case 101: +case 102: this.$ = {type: "DECLARE", declareType: "VARIABLE", name: $$[$0]} setLines(this.$, _$[$0-1], _$[$0]); break; -case 102: +case 103: this.$ = {type: "DECLARE", declareType: "SIGNAL", name: $$[$0]} setLines(this.$, _$[$0-1], _$[$0]); break; -case 103: +case 104: this.$ = {type: "DECLARE", declareType: "SIGNALIN", name: $$[$0]}; setLines(this.$, _$[$0-2], _$[$0]); break; -case 104: +case 105: this.$ = {type: "DECLARE", declareType: "SIGNALIN", private: true, name: $$[$0]}; setLines(this.$, _$[$0-3], _$[$0]); break; -case 105: +case 106: this.$ = {type: "DECLARE", declareType: "SIGNALOUT", name: $$[$0]}; setLines(this.$, _$[$0-2], _$[$0]); break; -case 106: +case 107: this.$ = {type: "DECLARE", declareType: "COMPONENT", name: $$[$0]} setLines(this.$, _$[$0-1], _$[$0]); break; -case 107: +case 108: for (let i=0; i< $$[$0].values.length; i++) { $$[$0-1].selectors.push($$[$0].values[i]); @@ -663,37 +673,37 @@ case 107: setLines($$[$0-1], _$[$0-1], _$[$0]); break; -case 108: +case 109: this.$ = {type: "VARIABLE", name: $$[$0] , selectors: []}; setLines(this.$, _$[$0]); break; -case 109: +case 110: this.$ = {type: "FUNCTIONCALL", name: $$[$0-3], params: $$[$0-1].expressions} setLines(this.$, _$[$0-3], _$[$0]); break; -case 110: +case 111: this.$ = {type: "FUNCTIONCALL", name: $$[$0-2], params: []} setLines(this.$, _$[$0-2], _$[$0]); break; -case 111: +case 112: $$[$0-2].expressions.push($$[$0]); setLines(this.$, _$[$0-2], _$[$0]); break; -case 112: +case 113: this.$ = {type: "EXPRESSIONLST", expressions: [$$[$0]]}; setLines(this.$, _$[$0]); break; -case 114: +case 115: this.$ = { type: "ARRAY", values: $$[$0-1].expressions}; setLines(this.$, _$[$0-2], _$[$0]); @@ -701,7 +711,7 @@ case 114: break; } }, -table: [{3:1,4:2,6:3,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{1:[3]},{5:[1,60],6:61,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},o($Vn,[2,3]),o($Vo,[2,4]),o($Vo,[2,5]),o($Vo,[2,6]),o($Vo,[2,7]),o($Vo,[2,8]),o($Vo,[2,9]),o($Vo,[2,10]),o($Vo,[2,11]),o($Vo,[2,12]),o($Vo,[2,13]),{18:[1,62]},{18:[1,63]},{19:[1,64]},{19:[1,65]},{19:[1,66]},{6:67,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,25:68,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{4:69,6:3,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},o($Vo,[2,31],{28:[1,70]}),{33:[1,71]},o([5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,80,82,89,90,91,92,96,97,101,102,106,109,110],[2,32],{50:$Vp,52:$Vq,55:$Vr}),o($Vs,$Vt,{38:[1,75],39:[1,76],40:[1,77],41:[1,78],42:[1,79],43:[1,80],44:[1,81],45:[1,82],46:[1,83],47:[1,84],48:[1,85],49:[1,86],51:[1,87],89:$Vu,90:$Vv}),o($Vw,[2,50],{54:[1,90]}),o($Vx,[2,100],{107:92,99:[1,91],109:$Vm}),o([5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,83,85,86,87,89,90,91,92,96,97,101,102,106,109,110],[2,99]),o($Vy,[2,51]),o($Vy,[2,52],{59:[1,93]}),o([5,17,18,21,22,23,24,26,27,28,29,30,31,32,34,35,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,83,85,86,87,89,90,91,92,96,97,99,101,102,106,109,110],$Vz,{19:[1,94]}),{18:$VA,98:95},{18:$VA,98:97,103:[1,98],104:[1,99],105:[1,100]},{18:$VA,98:101},o($Vy,[2,113]),o($VB,[2,54],{61:$VC}),{18:$V1,19:$V2,25:104,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,108:103,109:$Vm},o($VD,[2,56],{63:$VE}),o($VF,[2,58],{65:$VG}),o($VH,[2,60],{67:$VI}),o($VJ,[2,62],{69:$VK,71:$VL}),o($VM,[2,65],{72:$VN,74:$VO,75:$VP,76:$VQ}),o($VR,[2,70],{77:$VS,79:$VT}),o($VU,[2,73],{80:$VV,82:$VW}),o($VX,[2,76],{83:$VY,85:$VZ,86:$V_}),o($V$,[2,80],{87:$V01}),o($V11,[2,82]),{18:$VA,37:122,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$VA,37:123,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,80:$Vb,82:$Vc,88:124,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,80:$Vb,82:$Vc,88:126,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,80:$Vb,82:$Vc,88:127,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,80:$Vb,82:$Vc,88:128,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},o($V11,[2,89]),o($V11,[2,92]),o($V11,[2,93]),o($V11,[2,95]),o($V11,[2,96]),{18:$V1,19:$V2,25:129,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{1:[2,1]},o($Vn,[2,2]),{19:[1,130]},{19:[1,131]},{18:$V1,19:$V2,25:132,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,25:133,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,25:134,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{29:[1,135]},o($Vo,[2,26],{28:[1,136]}),{6:61,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,35:[1,137],36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},o($Vo,[2,30]),o($Vo,[2,28],{28:[1,138]}),{18:$VA,37:139,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$VA,37:140,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,36:141,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,36:142,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,36:143,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,36:144,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,36:145,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,36:146,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,36:147,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,36:148,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,36:149,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,36:150,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,36:151,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,36:152,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,36:153,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,36:154,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},o($V11,[2,90]),o($V11,[2,91]),{18:$V1,19:$V2,36:155,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$VA,98:156},o($V21,[2,107]),{18:$V1,19:$V2,37:125,60:157,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,21:[1,159],25:104,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,108:158,109:$Vm},o($Vx,[2,101],{107:92,109:$Vm}),o($V21,$Vz),o($Vx,[2,102],{107:92,109:$Vm}),{18:$VA,98:160},{103:[1,161]},{18:$VA,98:162},o($Vx,[2,106],{107:92,109:$Vm}),{18:$V1,19:$V2,37:125,62:163,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{23:$V31,110:[1,164]},o($V41,[2,112]),{18:$V1,19:$V2,37:125,64:166,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,66:167,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,68:168,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,70:169,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,70:170,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,73:171,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,73:172,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,73:173,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,73:174,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,78:175,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,78:176,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,80:$Vb,81:177,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,80:$Vb,81:178,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,80:$Vb,82:$Vc,84:179,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,80:$Vb,82:$Vc,84:180,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,80:$Vb,82:$Vc,84:181,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},{18:$V1,19:$V2,37:125,80:$Vb,82:$Vc,88:182,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl},o($V11,[2,83]),o($V11,[2,84]),o($V11,[2,85]),o($Vs,$Vt,{89:$Vu,90:$Vv}),o($V11,[2,86]),o($V11,[2,87]),o($V11,[2,88]),{21:[1,183]},{18:$V51,20:184,21:[1,185]},{18:$V51,20:187,21:[1,188]},{21:[1,189]},{28:[1,190]},{21:[1,191]},{19:[1,192]},o($Vo,[2,25]),o($Vo,[2,29]),o($Vo,[2,27]),o($Vw,[2,45]),o($Vw,[2,47]),{50:$Vp,52:$Vq,55:$Vr,56:[1,193]},o($V61,[2,33],{50:$Vp,52:$Vq,55:$Vr}),o($V61,[2,34],{50:$Vp,52:$Vq,55:$Vr}),o($V61,[2,35],{50:$Vp,52:$Vq,55:$Vr}),o($V61,[2,36],{50:$Vp,52:$Vq,55:$Vr}),o($V61,[2,37],{50:$Vp,52:$Vq,55:$Vr}),o($V61,[2,38],{50:$Vp,52:$Vq,55:$Vr}),o($V61,[2,39],{50:$Vp,52:$Vq,55:$Vr}),o($V61,[2,40],{50:$Vp,52:$Vq,55:$Vr}),o($V61,[2,41],{50:$Vp,52:$Vq,55:$Vr}),o($V61,[2,42],{50:$Vp,52:$Vq,55:$Vr}),o($V61,[2,43],{50:$Vp,52:$Vq,55:$Vr}),o($V61,[2,44],{50:$Vp,52:$Vq,55:$Vr}),o($V61,[2,46],{50:$Vp,52:$Vq,55:$Vr}),o($V61,[2,48],{50:$Vp,52:$Vq,55:$Vr}),o($Vx,[2,98],{107:92,109:$Vm}),o($VB,[2,53],{61:$VC}),{21:[1,194],23:$V31},o($V11,[2,110]),o($Vx,[2,103],{107:92,109:$Vm}),{18:$VA,98:195},o($Vx,[2,105],{107:92,109:$Vm}),o($VD,[2,55],{63:$VE}),o($V21,[2,114]),{18:$V1,19:$V2,25:196,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},o($VF,[2,57],{65:$VG}),o($VH,[2,59],{67:$VI}),o($VJ,[2,61],{69:$VK,71:$VL}),o($VM,[2,63],{72:$VN,74:$VO,75:$VP,76:$VQ}),o($VM,[2,64],{72:$VN,74:$VO,75:$VP,76:$VQ}),o($VR,[2,66],{77:$VS,79:$VT}),o($VR,[2,67],{77:$VS,79:$VT}),o($VR,[2,68],{77:$VS,79:$VT}),o($VR,[2,69],{77:$VS,79:$VT}),o($VU,[2,71],{80:$VV,82:$VW}),o($VU,[2,72],{80:$VV,82:$VW}),o($VX,[2,74],{83:$VY,85:$VZ,86:$V_}),o($VX,[2,75],{83:$VY,85:$VZ,86:$V_}),o($V$,[2,77],{87:$V01}),o($V$,[2,78],{87:$V01}),o($V$,[2,79],{87:$V01}),o($V11,[2,81]),o($V11,[2,97]),{21:[1,197],23:$V71},{14:199,34:$Va},o($V81,[2,19]),{21:[1,200],23:$V71},{14:201,34:$Va},{6:202,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,25:203,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{6:204,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,25:205,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,36:206,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},o($V11,[2,109]),o($Vx,[2,104],{107:92,109:$Vm}),o($V41,[2,111]),{14:207,34:$Va},{18:[1,208]},o($Vo,[2,15]),{14:209,34:$Va},o($Vo,[2,17]),o($Vn,[2,21],{26:[1,210]}),{28:[1,211]},o($Vo,[2,23]),{21:[1,212]},o($V61,[2,49],{50:$Vp,52:$Vq,55:$Vr}),o($Vo,[2,14]),o($V81,[2,18]),o($Vo,[2,16]),{6:213,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},{18:$V1,19:$V2,25:214,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},o($Vo,[2,24]),o($Vo,[2,20]),{21:[1,215]},{6:216,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,88:47,89:$Vd,90:$Ve,91:$Vf,92:$Vg,93:54,94:55,95:56,96:$Vh,97:$Vi,98:27,100:28,101:$Vj,102:$Vk,106:$Vl,107:35,109:$Vm},o($Vo,[2,22])], +table: [{3:1,4:2,6:3,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{1:[3]},{5:[1,60],6:61,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},o($Vn,[2,3]),o($Vo,[2,4]),o($Vo,[2,5]),o($Vo,[2,6]),o($Vo,[2,7]),o($Vo,[2,8]),o($Vo,[2,9]),o($Vo,[2,10]),o($Vo,[2,11]),o($Vo,[2,12]),o($Vo,[2,13]),{18:[1,62]},{18:[1,63]},{19:[1,64]},{19:[1,65]},{19:[1,66]},{6:67,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,25:68,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{4:69,6:3,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},o($Vo,[2,31],{28:[1,70]}),{33:[1,71]},o([5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,80,82,90,91,92,93,97,98,102,103,107,110,111],[2,32],{50:$Vp,52:$Vq,55:$Vr}),o($Vs,$Vt,{38:[1,75],39:[1,76],40:[1,77],41:[1,78],42:[1,79],43:[1,80],44:[1,81],45:[1,82],46:[1,83],47:[1,84],48:[1,85],49:[1,86],51:[1,87],90:$Vu,91:$Vv}),o($Vw,[2,50],{54:[1,90]}),o($Vx,[2,101],{108:92,100:[1,91],110:$Vm}),o([5,17,18,19,21,22,23,24,26,27,28,29,30,31,32,34,35,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,83,85,86,87,88,90,91,92,93,97,98,102,103,107,110,111],[2,100]),o($Vy,[2,51]),o($Vy,[2,52],{59:[1,93]}),o([5,17,18,21,22,23,24,26,27,28,29,30,31,32,34,35,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,54,55,56,59,61,63,65,67,69,71,72,74,75,76,77,79,80,82,83,85,86,87,88,90,91,92,93,97,98,100,102,103,107,110,111],$Vz,{19:[1,94]}),{18:$VA,99:95},{18:$VA,99:97,104:[1,98],105:[1,99],106:[1,100]},{18:$VA,99:101},o($Vy,[2,114]),o($VB,[2,54],{61:$VC}),{18:$V1,19:$V2,25:104,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,109:103,110:$Vm},o($VD,[2,56],{63:$VE}),o($VF,[2,58],{65:$VG}),o($VH,[2,60],{67:$VI}),o($VJ,[2,62],{69:$VK,71:$VL}),o($VM,[2,65],{72:$VN,74:$VO,75:$VP,76:$VQ}),o($VR,[2,70],{77:$VS,79:$VT}),o($VU,[2,73],{80:$VV,82:$VW}),o($VX,[2,76],{83:$VY,85:$VZ,86:$V_,87:$V$}),o($V01,[2,81],{88:$V11}),o($V21,[2,83]),{18:$VA,37:123,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$VA,37:124,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,80:$Vb,82:$Vc,89:125,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,80:$Vb,82:$Vc,89:127,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,80:$Vb,82:$Vc,89:128,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,80:$Vb,82:$Vc,89:129,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},o($V21,[2,90]),o($V21,[2,93]),o($V21,[2,94]),o($V21,[2,96]),o($V21,[2,97]),{18:$V1,19:$V2,25:130,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{1:[2,1]},o($Vn,[2,2]),{19:[1,131]},{19:[1,132]},{18:$V1,19:$V2,25:133,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,25:134,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,25:135,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{29:[1,136]},o($Vo,[2,26],{28:[1,137]}),{6:61,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,35:[1,138],36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},o($Vo,[2,30]),o($Vo,[2,28],{28:[1,139]}),{18:$VA,37:140,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$VA,37:141,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,36:142,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,36:143,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,36:144,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,36:145,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,36:146,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,36:147,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,36:148,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,36:149,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,36:150,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,36:151,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,36:152,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,36:153,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,36:154,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,36:155,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},o($V21,[2,91]),o($V21,[2,92]),{18:$V1,19:$V2,36:156,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$VA,99:157},o($V31,[2,108]),{18:$V1,19:$V2,37:126,60:158,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,21:[1,160],25:104,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,109:159,110:$Vm},o($Vx,[2,102],{108:92,110:$Vm}),o($V31,$Vz),o($Vx,[2,103],{108:92,110:$Vm}),{18:$VA,99:161},{104:[1,162]},{18:$VA,99:163},o($Vx,[2,107],{108:92,110:$Vm}),{18:$V1,19:$V2,37:126,62:164,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{23:$V41,111:[1,165]},o($V51,[2,113]),{18:$V1,19:$V2,37:126,64:167,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,66:168,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,68:169,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,70:170,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,70:171,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,73:172,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,73:173,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,73:174,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,73:175,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,78:176,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,78:177,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,80:$Vb,81:178,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,80:$Vb,81:179,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,80:$Vb,82:$Vc,84:180,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,80:$Vb,82:$Vc,84:181,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,80:$Vb,82:$Vc,84:182,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,80:$Vb,82:$Vc,84:183,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},{18:$V1,19:$V2,37:126,80:$Vb,82:$Vc,89:184,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl},o($V21,[2,84]),o($V21,[2,85]),o($V21,[2,86]),o($Vs,$Vt,{90:$Vu,91:$Vv}),o($V21,[2,87]),o($V21,[2,88]),o($V21,[2,89]),{21:[1,185]},{18:$V61,20:186,21:[1,187]},{18:$V61,20:189,21:[1,190]},{21:[1,191]},{28:[1,192]},{21:[1,193]},{19:[1,194]},o($Vo,[2,25]),o($Vo,[2,29]),o($Vo,[2,27]),o($Vw,[2,45]),o($Vw,[2,47]),{50:$Vp,52:$Vq,55:$Vr,56:[1,195]},o($V71,[2,33],{50:$Vp,52:$Vq,55:$Vr}),o($V71,[2,34],{50:$Vp,52:$Vq,55:$Vr}),o($V71,[2,35],{50:$Vp,52:$Vq,55:$Vr}),o($V71,[2,36],{50:$Vp,52:$Vq,55:$Vr}),o($V71,[2,37],{50:$Vp,52:$Vq,55:$Vr}),o($V71,[2,38],{50:$Vp,52:$Vq,55:$Vr}),o($V71,[2,39],{50:$Vp,52:$Vq,55:$Vr}),o($V71,[2,40],{50:$Vp,52:$Vq,55:$Vr}),o($V71,[2,41],{50:$Vp,52:$Vq,55:$Vr}),o($V71,[2,42],{50:$Vp,52:$Vq,55:$Vr}),o($V71,[2,43],{50:$Vp,52:$Vq,55:$Vr}),o($V71,[2,44],{50:$Vp,52:$Vq,55:$Vr}),o($V71,[2,46],{50:$Vp,52:$Vq,55:$Vr}),o($V71,[2,48],{50:$Vp,52:$Vq,55:$Vr}),o($Vx,[2,99],{108:92,110:$Vm}),o($VB,[2,53],{61:$VC}),{21:[1,196],23:$V41},o($V21,[2,111]),o($Vx,[2,104],{108:92,110:$Vm}),{18:$VA,99:197},o($Vx,[2,106],{108:92,110:$Vm}),o($VD,[2,55],{63:$VE}),o($V31,[2,115]),{18:$V1,19:$V2,25:198,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},o($VF,[2,57],{65:$VG}),o($VH,[2,59],{67:$VI}),o($VJ,[2,61],{69:$VK,71:$VL}),o($VM,[2,63],{72:$VN,74:$VO,75:$VP,76:$VQ}),o($VM,[2,64],{72:$VN,74:$VO,75:$VP,76:$VQ}),o($VR,[2,66],{77:$VS,79:$VT}),o($VR,[2,67],{77:$VS,79:$VT}),o($VR,[2,68],{77:$VS,79:$VT}),o($VR,[2,69],{77:$VS,79:$VT}),o($VU,[2,71],{80:$VV,82:$VW}),o($VU,[2,72],{80:$VV,82:$VW}),o($VX,[2,74],{83:$VY,85:$VZ,86:$V_,87:$V$}),o($VX,[2,75],{83:$VY,85:$VZ,86:$V_,87:$V$}),o($V01,[2,77],{88:$V11}),o($V01,[2,78],{88:$V11}),o($V01,[2,79],{88:$V11}),o($V01,[2,80],{88:$V11}),o($V21,[2,82]),o($V21,[2,98]),{21:[1,199],23:$V81},{14:201,34:$Va},o($V91,[2,19]),{21:[1,202],23:$V81},{14:203,34:$Va},{6:204,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,25:205,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{6:206,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,25:207,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,36:208,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},o($V21,[2,110]),o($Vx,[2,105],{108:92,110:$Vm}),o($V51,[2,112]),{14:209,34:$Va},{18:[1,210]},o($Vo,[2,15]),{14:211,34:$Va},o($Vo,[2,17]),o($Vn,[2,21],{26:[1,212]}),{28:[1,213]},o($Vo,[2,23]),{21:[1,214]},o($V71,[2,49],{50:$Vp,52:$Vq,55:$Vr}),o($Vo,[2,14]),o($V91,[2,18]),o($Vo,[2,16]),{6:215,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},{18:$V1,19:$V2,25:216,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},o($Vo,[2,24]),o($Vo,[2,20]),{21:[1,217]},{6:218,7:4,8:5,9:6,10:7,11:8,12:9,13:10,14:11,15:12,16:13,17:$V0,18:$V1,19:$V2,22:$V3,24:$V4,25:22,27:$V5,29:$V6,30:$V7,31:$V8,32:$V9,34:$Va,36:24,37:25,53:26,57:29,58:30,60:36,62:38,64:39,66:40,68:41,70:42,73:43,78:44,80:$Vb,81:45,82:$Vc,84:46,89:47,90:$Vd,91:$Ve,92:$Vf,93:$Vg,94:54,95:55,96:56,97:$Vh,98:$Vi,99:27,101:28,102:$Vj,103:$Vk,107:$Vl,108:35,110:$Vm},o($Vo,[2,22])], defaultActions: {60:[2,1]}, parseError: function parseError (str, hash) { if (hash.recoverable) { @@ -1197,19 +1207,19 @@ case 1: /* console.log("MULTILINE COMMENT: "+yy_.yytext); */ break; case 2: /* console.log("SINGLE LINE COMMENT: "+yy_.yytext); */ break; -case 3: return 101; +case 3: return 102; break; -case 4: return 102; +case 4: return 103; break; -case 5: return 104; +case 5: return 105; break; -case 6: return 103; +case 6: return 104; break; -case 7: return 105; +case 7: return 106; break; case 8: return 'linearCombination'; break; -case 9: return 106; +case 9: return 107; break; case 10: return 22; break; @@ -1229,9 +1239,9 @@ case 17: return 31; break; case 18: return 32; break; -case 19: return 97; +case 19: return 98; break; -case 20: return 96; +case 20: return 97; break; case 21: return 18; break; @@ -1267,11 +1277,11 @@ case 36: return 79; break; case 37: return 77; break; -case 38: return 87; +case 38: return 88; break; -case 39: return 89; +case 39: return 90; break; -case 40: return 90; +case 40: return 91; break; case 41: return 39; break; @@ -1301,50 +1311,52 @@ case 53: return 85; break; case 54: return 86; break; -case 55: return 65; +case 55: return 87; break; -case 56: return 67; +case 56: return 65; break; -case 57: return 63; +case 57: return 67; break; -case 58: return 91; +case 58: return 63; break; -case 59: return 75; +case 59: return 92; break; -case 60: return 76; +case 60: return 75; break; -case 61: return 91; +case 61: return 76; break; -case 62: return 55; +case 62: return 92; break; -case 63: return 56; +case 63: return 55; break; -case 64: return 19; +case 64: return 56; break; -case 65: return 21; +case 65: return 19; break; -case 66: return 109; +case 66: return 21; break; case 67: return 110; break; -case 68: return 34; +case 68: return 111; +break; +case 69: return 34; break; -case 69: return 35; +case 70: return 35; break; -case 70: return 28; +case 71: return 28; break; -case 71: return 23; +case 72: return 23; break; -case 72: return 99; +case 73: return 100; break; -case 73: return 5; +case 74: return 5; break; -case 74: console.log("INVALID: " + yy_.yytext); return 'INVALID' +case 75: console.log("INVALID: " + yy_.yytext); return 'INVALID' break; } }, -rules: [/^(?:\s+)/,/^(?:\/\*([^*]|[\r\n]|(\*+([^*\/]|[\r\n])))*\*+\/)/,/^(?:\/\/.*)/,/^(?:var\b)/,/^(?:signal\b)/,/^(?:private\b)/,/^(?:input\b)/,/^(?:output\b)/,/^(?:linearCombination\b)/,/^(?:component\b)/,/^(?:template\b)/,/^(?:function\b)/,/^(?:if\b)/,/^(?:else\b)/,/^(?:for\b)/,/^(?:while\b)/,/^(?:do\b)/,/^(?:return\b)/,/^(?:include\b)/,/^(?:0x[0-9A-Fa-f]*)/,/^(?:[0-9]+)/,/^(?:[a-zA-Z][a-zA-Z$_0-9]*)/,/^(?:"[^"]+")/,/^(?:==>)/,/^(?:<==)/,/^(?:-->)/,/^(?:<--)/,/^(?:===)/,/^(?:>>=)/,/^(?:<<=)/,/^(?:&&)/,/^(?:\|\|)/,/^(?:==)/,/^(?:<=)/,/^(?:>=)/,/^(?:!=)/,/^(?:>>)/,/^(?:<<)/,/^(?:\*\*)/,/^(?:\+\+)/,/^(?:--)/,/^(?:\+=)/,/^(?:-=)/,/^(?:\*=)/,/^(?:\/=)/,/^(?:%=)/,/^(?:\|=)/,/^(?:&=)/,/^(?:\^=)/,/^(?:=)/,/^(?:\+)/,/^(?:-)/,/^(?:\*)/,/^(?:\/)/,/^(?:%)/,/^(?:\^)/,/^(?:&)/,/^(?:\|)/,/^(?:!)/,/^(?:<)/,/^(?:>)/,/^(?:!)/,/^(?:\?)/,/^(?::)/,/^(?:\()/,/^(?:\))/,/^(?:\[)/,/^(?:\])/,/^(?:\{)/,/^(?:\})/,/^(?:;)/,/^(?:,)/,/^(?:\.)/,/^(?:$)/,/^(?:.)/], -conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74],"inclusive":true}} +rules: [/^(?:\s+)/,/^(?:\/\*([^*]|[\r\n]|(\*+([^*\/]|[\r\n])))*\*+\/)/,/^(?:\/\/.*)/,/^(?:var\b)/,/^(?:signal\b)/,/^(?:private\b)/,/^(?:input\b)/,/^(?:output\b)/,/^(?:linearCombination\b)/,/^(?:component\b)/,/^(?:template\b)/,/^(?:function\b)/,/^(?:if\b)/,/^(?:else\b)/,/^(?:for\b)/,/^(?:while\b)/,/^(?:do\b)/,/^(?:return\b)/,/^(?:include\b)/,/^(?:0x[0-9A-Fa-f]*)/,/^(?:[0-9]+)/,/^(?:[a-zA-Z][a-zA-Z$_0-9]*)/,/^(?:"[^"]+")/,/^(?:==>)/,/^(?:<==)/,/^(?:-->)/,/^(?:<--)/,/^(?:===)/,/^(?:>>=)/,/^(?:<<=)/,/^(?:&&)/,/^(?:\|\|)/,/^(?:==)/,/^(?:<=)/,/^(?:>=)/,/^(?:!=)/,/^(?:>>)/,/^(?:<<)/,/^(?:\*\*)/,/^(?:\+\+)/,/^(?:--)/,/^(?:\+=)/,/^(?:-=)/,/^(?:\*=)/,/^(?:\/=)/,/^(?:%=)/,/^(?:\|=)/,/^(?:&=)/,/^(?:\^=)/,/^(?:=)/,/^(?:\+)/,/^(?:-)/,/^(?:\*)/,/^(?:\/)/,/^(?:\\)/,/^(?:%)/,/^(?:\^)/,/^(?:&)/,/^(?:\|)/,/^(?:!)/,/^(?:<)/,/^(?:>)/,/^(?:!)/,/^(?:\?)/,/^(?::)/,/^(?:\()/,/^(?:\))/,/^(?:\[)/,/^(?:\])/,/^(?:\{)/,/^(?:\})/,/^(?:;)/,/^(?:,)/,/^(?:\.)/,/^(?:$)/,/^(?:.)/], +conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75],"inclusive":true}} }); return lexer; })(); diff --git a/src/exec.js b/src/exec.js index 01371f2..60a7d9d 100644 --- a/src/exec.js +++ b/src/exec.js @@ -80,10 +80,16 @@ function exec(ctx, ast) { return execPlusPlusLeft(ctx, ast); } else if (ast.op == "/") { return execDiv(ctx, ast); + } else if (ast.op == "\\") { + return execIDiv(ctx, ast); } else if (ast.op == "**") { return execExp(ctx, ast); } else if (ast.op == "&") { return execBAnd(ctx, ast); + } else if (ast.op == "&&") { + return execAnd(ctx, ast); + } else if (ast.op == "||") { + return execOr(ctx, ast); } else if (ast.op == "<<") { return execShl(ctx, ast); } else if (ast.op == ">>") { @@ -546,6 +552,8 @@ function execPin(ctx, ast) { } function execFor(ctx, ast) { + + ctx.scopes.push({}); exec(ctx, ast.init); if (ctx.error) return; @@ -564,6 +572,7 @@ function execFor(ctx, ast) { if (ctx.error) return; } } + ctx.scopes.pop(); } function execWhile(ctx, ast) { @@ -722,6 +731,34 @@ function execBAnd(ctx, ast) { }; } +function execAnd(ctx, ast) { + const a = exec(ctx, ast.values[0]); + if (ctx.error) return; + if (a.type != "NUMBER") return { type: "NUMBER" }; + const b = exec(ctx, ast.values[1]); + if (ctx.error) return; + if (b.type != "NUMBER") return { type: "NUMBER" }; + if (!a.value || !b.value) return { type: "NUMBER" }; + return { + type: "NUMBER", + value: (a.value.neq(0) && a.value.neq(0)) ? bigInt(1) : bigInt(0) + }; +} + +function execOr(ctx, ast) { + const a = exec(ctx, ast.values[0]); + if (ctx.error) return; + if (a.type != "NUMBER") return { type: "NUMBER" }; + const b = exec(ctx, ast.values[1]); + if (ctx.error) return; + if (b.type != "NUMBER") return { type: "NUMBER" }; + if (!a.value || !b.value) return { type: "NUMBER" }; + return { + type: "NUMBER", + value: (a.value.neq(0) || a.value.neq(0)) ? bigInt(1) : bigInt(0) + }; +} + function execShl(ctx, ast) { const a = exec(ctx, ast.values[0]); if (ctx.error) return; @@ -796,6 +833,21 @@ function execDiv(ctx, ast) { }; } +function execIDiv(ctx, ast) { + const a = exec(ctx, ast.values[0]); + if (ctx.error) return; + if (a.type != "NUMBER") return { type: "NUMBER" }; + const b = exec(ctx, ast.values[1]); + if (ctx.error) return; + if (b.type != "NUMBER") return { type: "NUMBER" }; + if (!a.value || !b.value) return { type: "NUMBER" }; + if (b.value.isZero()) return error(ctx, ast, "Division by zero"); + return { + type: "NUMBER", + value: a.value.divide(b.value) + }; +} + function execAdd(ctx, ast) { const a = exec(ctx, ast.values[0]); if (ctx.error) return; diff --git a/src/gencode.js b/src/gencode.js index 2f7214e..5321d56 100644 --- a/src/gencode.js +++ b/src/gencode.js @@ -67,8 +67,14 @@ function gen(ctx, ast) { return genExp(ctx, ast); } else if (ast.op == "/") { return genDiv(ctx, ast); + } else if (ast.op == "\\") { + return genIDiv(ctx, ast); } else if (ast.op == "&") { return genBAnd(ctx, ast); + } else if (ast.op == "&&") { + return genAnd(ctx, ast); + } else if (ast.op == "||") { + return genOr(ctx, ast); } else if (ast.op == "<<") { return genShl(ctx, ast); } else if (ast.op == ">>") { @@ -457,6 +463,15 @@ function genDiv(ctx, ast) { return `bigInt(${a}).mul( bigInt(${b}).inverse(__P__) ).mod(__P__)`; } +function genIDiv(ctx, ast) { + const a = gen(ctx, ast.values[0]); + if (ctx.error) return; + const b = gen(ctx, ast.values[1]); + if (ctx.error) return; + + return `bigInt(${a}).div( bigInt(${b}))`; +} + function genExp(ctx, ast) { const a = gen(ctx, ast.values[0]); if (ctx.error) return; @@ -473,6 +488,22 @@ function genBAnd(ctx, ast) { return `bigInt(${a}).and(bigInt(${b})).and(__MASK__)`; } +function genAnd(ctx, ast) { + const a = gen(ctx, ast.values[0]); + if (ctx.error) return; + const b = gen(ctx, ast.values[1]); + if (ctx.error) return; + return `((bigInt(${a}).neq(bigInt(0)) && bigInt(${b}).neq(bigInt(0))) ? bigInt(1) : bigInt(0))`; +} + +function genOr(ctx, ast) { + const a = gen(ctx, ast.values[0]); + if (ctx.error) return; + const b = gen(ctx, ast.values[1]); + if (ctx.error) return; + return `((bigInt(${a}).neq(bigInt(0)) || bigInt(${b}).neq(bigInt(0))) ? bigInt(1) : bigInt(0))`; +} + function genShl(ctx, ast) { const a = gen(ctx, ast.values[0]); if (ctx.error) return; diff --git a/test/cases.js b/test/cases.js index 49df23f..9e94bfc 100644 --- a/test/cases.js +++ b/test/cases.js @@ -1,14 +1,36 @@ const chai = require("chai"); const path = require("path"); const snarkjs = require("snarkjs"); -const crypto = require("crypto"); + +const bigInt = snarkjs.bigInt; const compiler = require("../index.js"); const assert = chai.assert; describe("Sum test", () => { - it("Should compile a code with an undefined if", async() => { + it("Should compile a code with an undefined if", async () => { await compiler(path.join(__dirname, "circuits", "undefinedif.circom")); }); + it("Should compile a code with vars inside a for", async () => { + const cirDef = await compiler(path.join(__dirname, "circuits", "forvariables.circom")); + + const circuit = new snarkjs.Circuit(cirDef); + + const witness = circuit.calculateWitness({ "in": 111}); + assert(witness[0].equals(bigInt(1))); + assert(witness[1].equals(bigInt(114))); + assert(witness[2].equals(bigInt(111))); + + }); + it("Should compile a code with an undefined if", async () => { + const cirDef = await compiler(path.join(__dirname, "circuits", "mixvarsignal.circom")); + + const circuit = new snarkjs.Circuit(cirDef); + + const witness = circuit.calculateWitness({ "i": 111}); + assert(witness[0].equals(bigInt(1))); + assert(witness[1].equals(bigInt(111))); + assert(witness[2].equals(bigInt(111))); + }); }); diff --git a/test/circuits/declareandistantiate.circom b/test/circuits/declareandistantiate.circom new file mode 100644 index 0000000..9d77af9 --- /dev/null +++ b/test/circuits/declareandistantiate.circom @@ -0,0 +1,12 @@ + + + +template A() { + signal a; +} + +template B() { + component a[2] = A(); +} + +component main = B(); diff --git a/test/circuits/forvariables.circom b/test/circuits/forvariables.circom new file mode 100644 index 0000000..62097f0 --- /dev/null +++ b/test/circuits/forvariables.circom @@ -0,0 +1,19 @@ +template A() { + signal input in; + signal output out; + + var acc = 0; + for (var i=0; i<3; i++) { + if (i==1) { + var accIn = 0; + for (var j=0; j<3; j++) { + accIn= accIn+1; + } + acc = acc + accIn; + } + } + + out <== in + acc; +} + +component main = A(); diff --git a/test/circuits/mixvarsignal.circom b/test/circuits/mixvarsignal.circom new file mode 100644 index 0000000..41e114f --- /dev/null +++ b/test/circuits/mixvarsignal.circom @@ -0,0 +1,14 @@ +template X() { + signal input i; + signal output out; + + var r = 0; + for (var n=0; n