From cebe033b4bcfdf90a3a57f2a0f88e11b48764aa8 Mon Sep 17 00:00:00 2001 From: vijay40 Date: Wed, 17 Dec 2014 15:24:28 +0530 Subject: [PATCH] The directions can now be specified with special symbols along with acronyms. So >,<,^,v can be used in place of LR,RL,BT,TB respectively. --- src/diagrams/flowchart/parser/flow.jison | 19 +- src/diagrams/flowchart/parser/flow.js | 197 +++++++++++---------- src/diagrams/flowchart/parser/flow.spec.js | 78 ++++++++ 3 files changed, 197 insertions(+), 97 deletions(-) diff --git a/src/diagrams/flowchart/parser/flow.jison b/src/diagrams/flowchart/parser/flow.jison index e50988c7e..6f656d31e 100644 --- a/src/diagrams/flowchart/parser/flow.jison +++ b/src/diagrams/flowchart/parser/flow.jison @@ -26,6 +26,8 @@ "." return 'DOT'; "<" return 'TAGSTART'; ">" return 'TAGEND'; +"^" return 'UP' +"v" return 'DOWN' \-\-[x] return 'ARROW_CROSS'; \-\-\> return 'ARROW_POINT'; \-\-[o] return 'ARROW_CIRCLE'; @@ -128,14 +130,21 @@ expressions ; graphConfig - : GRAPH SPACE DIR SEMI - { yy.setDirection($3);$$ = $3;} - | GRAPH SPACE DIR NEWLINE - { yy.setDirection($3);$$ = $3;} - | GRAPH SPACE DIR spaceList NEWLINE + : GRAPH SPACE DIR FirstStmtSeperator { yy.setDirection($3);$$ = $3;} + | GRAPH SPACE TAGEND FirstStmtSeperator + { yy.setDirection("LR");$$ = $3;} + | GRAPH SPACE TAGSTART FirstStmtSeperator + { yy.setDirection("RL");$$ = $3;} + | GRAPH SPACE UP FirstStmtSeperator + { yy.setDirection("BT");$$ = $3;} + | GRAPH SPACE DOWN FirstStmtSeperator + { yy.setDirection("TB");$$ = $3;} ; +FirstStmtSeperator + : SEMI | NEWLINE | spaceList NEWLINE ; + statements : statement spaceListNewline statements | statement statements diff --git a/src/diagrams/flowchart/parser/flow.js b/src/diagrams/flowchart/parser/flow.js index b62bc7a17..f9c01ee7c 100644 --- a/src/diagrams/flowchart/parser/flow.js +++ b/src/diagrams/flowchart/parser/flow.js @@ -72,12 +72,12 @@ } */ 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,7],$V1=[1,8],$V2=[1,18],$V3=[1,19],$V4=[1,20],$V5=[1,21],$V6=[1,22],$V7=[1,27],$V8=[1,16],$V9=[1,29],$Va=[1,26],$Vb=[1,28],$Vc=[1,34],$Vd=[1,33],$Ve=[1,30],$Vf=[1,31],$Vg=[1,32],$Vh=[1,6],$Vi=[49,50,51,52,53,58,59,61,63,64,66,67,69,70,71],$Vj=[1,46],$Vk=[1,45],$Vl=[1,44],$Vm=[6,11,12],$Vn=[6,11,12,40,41,42,43],$Vo=[6,9,11,12,26,29,31,33,34,40,41,42,43],$Vp=[6,9,11,12,26,29,31,33,34,40,41,42,43,58,61,63,64,66,67,69,70,71],$Vq=[6,8,9,10,11,12,26,28,29,30,31,32,33,34,37,40,41,42,43,44,49,50,51,52,53,58,61,63,64,66,67,69,70,71,72,73,74],$Vr=[1,6,9,12,49,50,51,52,53,58,59,61,63,64,66,67,69,70,71],$Vs=[1,106],$Vt=[1,98],$Vu=[1,107],$Vv=[1,96],$Vw=[1,85],$Vx=[1,86],$Vy=[1,83],$Vz=[1,84],$VA=[1,87],$VB=[1,88],$VC=[1,81],$VD=[1,80],$VE=[1,99],$VF=[1,92],$VG=[1,93],$VH=[1,91],$VI=[1,94],$VJ=[1,82],$VK=[1,101],$VL=[1,102],$VM=[1,103],$VN=[1,104],$VO=[1,105],$VP=[1,89],$VQ=[1,90],$VR=[1,95],$VS=[58,61,63,64,66,67,69,70,71],$VT=[9,44,58,61,63,64,66,67,69,70,71],$VU=[1,129],$VV=[8,9,10,11,12,26,28,29,30,31,32,33,34,37,40,41,42,43,44,49,50,51,52,53,58,61,63,64,66,67,69,70,71,72,73,74],$VW=[2,92],$VX=[8,9,10,28,30,32,33,34,37,44,49,50,51,52,53,58,61,63,64,66,67,69,70,71],$VY=[9,12,49,50,51,52,53,58,59,61,63,64,66,67,69,70,71],$VZ=[1,157],$V_=[1,154],$V$=[1,158],$V01=[1,155],$V11=[1,152],$V21=[1,153],$V31=[1,156],$V41=[1,159],$V51=[1,160],$V61=[2,39],$V71=[1,171],$V81=[6,11,12,61],$V91=[6,9,11,12,37,57,58,61,63,64,65,66,67]; +var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,7],$V1=[1,8],$V2=[1,18],$V3=[1,19],$V4=[1,20],$V5=[1,21],$V6=[1,22],$V7=[1,27],$V8=[1,16],$V9=[1,29],$Va=[1,26],$Vb=[1,28],$Vc=[1,34],$Vd=[1,33],$Ve=[1,30],$Vf=[1,31],$Vg=[1,32],$Vh=[1,6],$Vi=[52,53,54,55,56,61,62,64,66,67,69,70,72,73,74],$Vj=[1,46],$Vk=[1,45],$Vl=[1,44],$Vm=[6,16,17],$Vn=[6,16,17,43,44,45,46],$Vo=[6,9,12,13,16,17,31,34,36,43,44,45,46],$Vp=[6,9,12,13,16,17,31,34,36,43,44,45,46,61,64,66,67,69,70,72,73,74],$Vq=[6,8,9,10,12,13,16,17,31,33,34,35,36,37,40,43,44,45,46,47,52,53,54,55,56,61,64,66,67,69,70,72,73,74,75,76,77],$Vr=[1,6,9,17,52,53,54,55,56,61,62,64,66,67,69,70,72,73,74],$Vs=[1,110],$Vt=[1,102],$Vu=[1,111],$Vv=[1,85],$Vw=[1,84],$Vx=[1,100],$Vy=[1,89],$Vz=[1,90],$VA=[1,87],$VB=[1,88],$VC=[1,91],$VD=[1,92],$VE=[1,103],$VF=[1,96],$VG=[1,97],$VH=[1,95],$VI=[1,98],$VJ=[1,86],$VK=[1,105],$VL=[1,106],$VM=[1,107],$VN=[1,108],$VO=[1,109],$VP=[1,93],$VQ=[1,94],$VR=[1,99],$VS=[61,64,66,67,69,70,72,73,74],$VT=[9,47,61,64,66,67,69,70,72,73,74],$VU=[1,134],$VV=[1,131],$VW=[1,132],$VX=[8,9,10,12,13,16,17,31,33,34,35,36,37,40,43,44,45,46,47,52,53,54,55,56,61,64,66,67,69,70,72,73,74,75,76,77],$VY=[2,97],$VZ=[8,9,10,12,13,33,35,37,40,47,52,53,54,55,56,61,64,66,67,69,70,72,73,74],$V_=[9,17,52,53,54,55,56,61,62,64,66,67,69,70,72,73,74],$V$=[1,166],$V01=[1,163],$V11=[1,167],$V21=[1,164],$V31=[1,161],$V41=[1,162],$V51=[1,165],$V61=[1,168],$V71=[1,169],$V81=[2,44],$V91=[1,180],$Va1=[6,16,17,64],$Vb1=[6,9,16,17,40,60,61,64,66,67,68,69,70]; var parser = {trace: function trace() { }, yy: {}, -symbols_: {"error":2,"expressions":3,"graphConfig":4,"statements":5,"EOF":6,"spaceListNewline":7,"GRAPH":8,"SPACE":9,"DIR":10,"SEMI":11,"NEWLINE":12,"spaceList":13,"statement":14,"commentStatement":15,"verticeStatement":16,"separator":17,"styleStatement":18,"linkStyleStatement":19,"classDefStatement":20,"classStatement":21,"clickStatement":22,"vertex":23,"link":24,"alphaNum":25,"SQS":26,"text":27,"SQE":28,"PS":29,"PE":30,"DIAMOND_START":31,"DIAMOND_STOP":32,"TAGEND":33,"TAGSTART":34,"alphaNumStatement":35,"alphaNumToken":36,"MINUS":37,"linkStatement":38,"arrowText":39,"ARROW_POINT":40,"ARROW_CIRCLE":41,"ARROW_CROSS":42,"ARROW_OPEN":43,"PIPE":44,"textToken":45,"commentText":46,"commentToken":47,"keywords":48,"STYLE":49,"LINKSTYLE":50,"CLASSDEF":51,"CLASS":52,"CLICK":53,"textNoTags":54,"textNoTagsToken":55,"stylesOpt":56,"HEX":57,"NUM":58,"PCT":59,"style":60,"COMMA":61,"styleComponent":62,"ALPHA":63,"COLON":64,"UNIT":65,"BRKT":66,"DOT":67,"graphCodeTokens":68,"PLUS":69,"EQUALS":70,"MULT":71,"TAG_START":72,"TAG_END":73,"QUOTE":74,"$accept":0,"$end":1}, -terminals_: {2:"error",6:"EOF",8:"GRAPH",9:"SPACE",10:"DIR",11:"SEMI",12:"NEWLINE",26:"SQS",28:"SQE",29:"PS",30:"PE",31:"DIAMOND_START",32:"DIAMOND_STOP",33:"TAGEND",34:"TAGSTART",37:"MINUS",40:"ARROW_POINT",41:"ARROW_CIRCLE",42:"ARROW_CROSS",43:"ARROW_OPEN",44:"PIPE",49:"STYLE",50:"LINKSTYLE",51:"CLASSDEF",52:"CLASS",53:"CLICK",57:"HEX",58:"NUM",59:"PCT",61:"COMMA",63:"ALPHA",64:"COLON",65:"UNIT",66:"BRKT",67:"DOT",69:"PLUS",70:"EQUALS",71:"MULT",72:"TAG_START",73:"TAG_END",74:"QUOTE"}, -productions_: [0,[3,3],[3,2],[3,4],[3,3],[4,4],[4,4],[4,5],[5,3],[5,2],[5,1],[7,2],[7,2],[7,1],[7,1],[13,2],[13,1],[14,2],[14,2],[14,2],[14,2],[14,2],[14,2],[14,2],[17,1],[17,1],[17,1],[16,3],[16,1],[23,4],[23,5],[23,6],[23,7],[23,4],[23,5],[23,4],[23,5],[23,4],[23,5],[23,4],[23,1],[23,2],[25,1],[25,2],[35,1],[35,3],[24,2],[24,3],[24,1],[24,2],[38,1],[38,1],[38,1],[38,1],[39,3],[27,1],[27,2],[46,1],[46,2],[48,1],[48,1],[48,1],[48,1],[48,1],[48,1],[48,1],[54,1],[54,2],[20,5],[21,5],[22,5],[18,5],[18,5],[19,5],[15,3],[56,1],[56,3],[60,1],[60,2],[62,1],[62,1],[62,1],[62,1],[62,1],[62,1],[62,1],[62,1],[62,1],[47,1],[47,1],[45,1],[45,1],[45,1],[55,1],[55,1],[55,1],[55,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1]], +symbols_: {"error":2,"expressions":3,"graphConfig":4,"statements":5,"EOF":6,"spaceListNewline":7,"GRAPH":8,"SPACE":9,"DIR":10,"FirstStmtSeperator":11,"TAGEND":12,"TAGSTART":13,"UP":14,"DOWN":15,"SEMI":16,"NEWLINE":17,"spaceList":18,"statement":19,"commentStatement":20,"verticeStatement":21,"separator":22,"styleStatement":23,"linkStyleStatement":24,"classDefStatement":25,"classStatement":26,"clickStatement":27,"vertex":28,"link":29,"alphaNum":30,"SQS":31,"text":32,"SQE":33,"PS":34,"PE":35,"DIAMOND_START":36,"DIAMOND_STOP":37,"alphaNumStatement":38,"alphaNumToken":39,"MINUS":40,"linkStatement":41,"arrowText":42,"ARROW_POINT":43,"ARROW_CIRCLE":44,"ARROW_CROSS":45,"ARROW_OPEN":46,"PIPE":47,"textToken":48,"commentText":49,"commentToken":50,"keywords":51,"STYLE":52,"LINKSTYLE":53,"CLASSDEF":54,"CLASS":55,"CLICK":56,"textNoTags":57,"textNoTagsToken":58,"stylesOpt":59,"HEX":60,"NUM":61,"PCT":62,"style":63,"COMMA":64,"styleComponent":65,"ALPHA":66,"COLON":67,"UNIT":68,"BRKT":69,"DOT":70,"graphCodeTokens":71,"PLUS":72,"EQUALS":73,"MULT":74,"TAG_START":75,"TAG_END":76,"QUOTE":77,"$accept":0,"$end":1}, +terminals_: {2:"error",6:"EOF",8:"GRAPH",9:"SPACE",10:"DIR",12:"TAGEND",13:"TAGSTART",14:"UP",15:"DOWN",16:"SEMI",17:"NEWLINE",31:"SQS",33:"SQE",34:"PS",35:"PE",36:"DIAMOND_START",37:"DIAMOND_STOP",40:"MINUS",43:"ARROW_POINT",44:"ARROW_CIRCLE",45:"ARROW_CROSS",46:"ARROW_OPEN",47:"PIPE",52:"STYLE",53:"LINKSTYLE",54:"CLASSDEF",55:"CLASS",56:"CLICK",60:"HEX",61:"NUM",62:"PCT",64:"COMMA",66:"ALPHA",67:"COLON",68:"UNIT",69:"BRKT",70:"DOT",72:"PLUS",73:"EQUALS",74:"MULT",75:"TAG_START",76:"TAG_END",77:"QUOTE"}, +productions_: [0,[3,3],[3,2],[3,4],[3,3],[4,4],[4,4],[4,4],[4,4],[4,4],[11,1],[11,1],[11,2],[5,3],[5,2],[5,1],[7,2],[7,2],[7,1],[7,1],[18,2],[18,1],[19,2],[19,2],[19,2],[19,2],[19,2],[19,2],[19,2],[22,1],[22,1],[22,1],[21,3],[21,1],[28,4],[28,5],[28,6],[28,7],[28,4],[28,5],[28,4],[28,5],[28,4],[28,5],[28,4],[28,1],[28,2],[30,1],[30,2],[38,1],[38,3],[29,2],[29,3],[29,1],[29,2],[41,1],[41,1],[41,1],[41,1],[42,3],[32,1],[32,2],[49,1],[49,2],[51,1],[51,1],[51,1],[51,1],[51,1],[51,1],[51,1],[57,1],[57,2],[25,5],[26,5],[27,5],[23,5],[23,5],[24,5],[20,3],[59,1],[59,3],[63,1],[63,2],[65,1],[65,1],[65,1],[65,1],[65,1],[65,1],[65,1],[65,1],[65,1],[50,1],[50,1],[48,1],[48,1],[48,1],[58,1],[58,1],[58,1],[58,1],[39,1],[39,1],[39,1],[39,1],[39,1],[39,1],[39,1],[39,1],[39,1],[71,1],[71,1],[71,1],[71,1],[71,1],[71,1],[71,1],[71,1],[71,1],[71,1],[71,1],[71,1],[71,1],[71,1],[71,1]], performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) { /* this == yyval */ @@ -89,115 +89,124 @@ break; case 4: this.$=$$[$0-2]; break; -case 5: case 6: +case 5: yy.setDirection($$[$0-1]);this.$ = $$[$0-1]; break; +case 6: + yy.setDirection("LR");this.$ = $$[$0-1]; +break; case 7: - yy.setDirection($$[$0-2]);this.$ = $$[$0-2]; + yy.setDirection("RL");this.$ = $$[$0-1]; break; -case 27: - yy.addLink($$[$0-2],$$[$0],$$[$0-1]);this.$ = 'oy' +case 8: + yy.setDirection("BT");this.$ = $$[$0-1]; break; -case 28: -this.$ = 'yo'; -break; -case 29: -this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'square'); -break; -case 30: -this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'square'); -break; -case 31: -this.$ = $$[$0-5];yy.addVertex($$[$0-5],$$[$0-2],'circle'); +case 9: + yy.setDirection("TB");this.$ = $$[$0-1]; break; case 32: -this.$ = $$[$0-6];yy.addVertex($$[$0-6],$$[$0-3],'circle'); + yy.addLink($$[$0-2],$$[$0],$$[$0-1]);this.$ = 'oy' break; case 33: -this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'round'); +this.$ = 'yo'; break; case 34: -this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'round'); +this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'square'); break; -case 35: case 39: -this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'diamond'); +case 35: +this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'square'); break; case 36: -this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'diamond'); +this.$ = $$[$0-5];yy.addVertex($$[$0-5],$$[$0-2],'circle'); break; case 37: -this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'odd'); +this.$ = $$[$0-6];yy.addVertex($$[$0-6],$$[$0-3],'circle'); break; case 38: -this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'odd'); +this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'round'); break; -case 40: -this.$ = $$[$0];yy.addVertex($$[$0]); +case 39: +this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'round'); +break; +case 40: case 44: +this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'diamond'); break; case 41: -this.$ = $$[$0-1];yy.addVertex($$[$0-1]); +this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'diamond'); break; -case 42: case 44: case 55: case 57: case 66: -this.$=$$[$0]; +case 42: +this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'odd'); break; -case 43: case 56: case 58: case 67: -this.$=$$[$0-1]+''+$$[$0]; +case 43: +this.$ = $$[$0-4];yy.addVertex($$[$0-4],$$[$0-2],'odd'); break; case 45: -this.$=$$[$0-2]+'-'+$$[$0]; +this.$ = $$[$0];yy.addVertex($$[$0]); break; case 46: -$$[$0-1].text = $$[$0];this.$ = $$[$0-1]; +this.$ = $$[$0-1];yy.addVertex($$[$0-1]); break; -case 47: -$$[$0-2].text = $$[$0-1];this.$ = $$[$0-2]; +case 47: case 49: case 60: case 62: case 71: +this.$=$$[$0]; break; -case 48: -this.$ = $$[$0]; -break; -case 49: case 54: -this.$ = $$[$0-1]; +case 48: case 61: case 63: case 72: +this.$=$$[$0-1]+''+$$[$0]; break; case 50: -this.$ = {"type":"arrow"}; +this.$=$$[$0-2]+'-'+$$[$0]; break; case 51: -this.$ = {"type":"arrow_circle"}; +$$[$0-1].text = $$[$0];this.$ = $$[$0-1]; break; case 52: -this.$ = {"type":"arrow_cross"}; +$$[$0-2].text = $$[$0-1];this.$ = $$[$0-2]; break; case 53: +this.$ = $$[$0]; +break; +case 54: case 59: +this.$ = $$[$0-1]; +break; +case 55: +this.$ = {"type":"arrow"}; +break; +case 56: +this.$ = {"type":"arrow_circle"}; +break; +case 57: +this.$ = {"type":"arrow_cross"}; +break; +case 58: this.$ = {"type":"arrow_open"}; break; -case 68: +case 73: this.$ = $$[$0-4];yy.addClass($$[$0-2],$$[$0]); break; -case 69: +case 74: this.$ = $$[$0-4];yy.setClass($$[$0-2], $$[$0]); break; -case 70: +case 75: this.$ = $$[$0-4];yy.setClickEvent($$[$0-2], $$[$0]); break; -case 71: +case 76: this.$ = $$[$0-4];yy.addVertex($$[$0-2],undefined,undefined,$$[$0]); break; -case 72: case 73: +case 77: case 78: this.$ = $$[$0-4];yy.updateLink($$[$0-2],$$[$0]); break; -case 75: +case 80: this.$ = [$$[$0]] break; -case 76: +case 81: $$[$0-2].push($$[$0]);this.$ = $$[$0-2]; break; -case 78: +case 83: this.$ = $$[$0-1] + $$[$0]; break; } }, -table: [{3:1,4:2,8:[1,3]},{1:[3]},{5:4,7:5,9:$V0,12:$V1,14:6,15:9,16:10,18:11,19:12,20:13,21:14,22:15,23:17,25:23,35:24,36:25,49:$V2,50:$V3,51:$V4,52:$V5,53:$V6,58:$V7,59:$V8,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{9:[1,35]},{1:[2,2],6:[1,36]},{5:37,14:6,15:9,16:10,18:11,19:12,20:13,21:14,22:15,23:17,25:23,35:24,36:25,49:$V2,50:$V3,51:$V4,52:$V5,53:$V6,58:$V7,59:$V8,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},o($Vh,[2,10],{14:6,15:9,16:10,18:11,19:12,20:13,21:14,22:15,23:17,25:23,35:24,36:25,7:38,5:39,9:$V0,12:$V1,49:$V2,50:$V3,51:$V4,52:$V5,53:$V6,58:$V7,59:$V8,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg}),o($Vi,[2,14],{7:40,9:$V0,12:$V1}),o($Vi,[2,13],{7:41,9:$V0,12:$V1}),{12:[1,42]},{6:$Vj,11:$Vk,12:$Vl,17:43},{6:$Vj,11:$Vk,12:$Vl,17:47},{6:$Vj,11:$Vk,12:$Vl,17:48},{6:$Vj,11:$Vk,12:$Vl,17:49},{6:$Vj,11:$Vk,12:$Vl,17:50},{6:$Vj,11:$Vk,12:$Vl,17:51},{59:[1,52]},o($Vm,[2,28],{24:53,38:54,40:[1,55],41:[1,56],42:[1,57],43:[1,58]}),{9:[1,59]},{9:[1,60]},{9:[1,61]},{9:[1,62]},{9:[1,63]},o($Vn,[2,40],{9:[1,69],26:[1,64],29:[1,65],31:[1,66],33:[1,67],34:[1,68]}),o($Vo,[2,42],{35:24,36:25,25:70,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg}),o($Vp,[2,44],{37:[1,71]}),o($Vq,[2,97]),o($Vq,[2,98]),o($Vq,[2,99]),o($Vq,[2,100]),o($Vq,[2,101]),o($Vq,[2,102]),o($Vq,[2,103]),o($Vq,[2,104]),o($Vq,[2,105]),{10:[1,72]},{1:[2,1]},{1:[2,4],6:[1,73]},{5:74,14:6,15:9,16:10,18:11,19:12,20:13,21:14,22:15,23:17,25:23,35:24,36:25,49:$V2,50:$V3,51:$V4,52:$V5,53:$V6,58:$V7,59:$V8,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},o($Vh,[2,9]),o($Vi,[2,11]),o($Vi,[2,12]),o($Vr,[2,17]),o($Vr,[2,18]),o($Vr,[2,24]),o($Vr,[2,25]),o($Vr,[2,26]),o($Vr,[2,19]),o($Vr,[2,20]),o($Vr,[2,21]),o($Vr,[2,22]),o($Vr,[2,23]),{8:$Vs,9:$Vt,10:$Vu,11:$Vv,26:$Vw,28:$Vx,29:$Vy,30:$Vz,31:$VA,32:$VB,33:$VC,34:$VD,36:97,37:$VE,40:$VF,41:$VG,42:$VH,43:$VI,44:$VJ,45:77,46:75,47:76,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,68:78,69:$Ve,70:$Vf,71:$Vg,72:$VP,73:$VQ,74:$VR},{23:108,25:23,35:24,36:25,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},o($VS,[2,48],{39:109,9:[1,110],44:[1,111]}),o($VT,[2,50]),o($VT,[2,51]),o($VT,[2,52]),o($VT,[2,53]),{25:112,35:24,36:25,57:[1,113],58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{58:[1,114]},{25:115,35:24,36:25,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{25:116,35:24,36:25,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{25:117,35:24,36:25,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{8:$Vs,9:$Vt,10:$Vu,27:118,33:$VC,34:$VD,36:97,37:$VE,45:119,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{8:$Vs,9:$Vt,10:$Vu,27:121,29:[1,120],33:$VC,34:$VD,36:97,37:$VE,45:119,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{8:$Vs,9:$Vt,10:$Vu,27:122,33:$VC,34:$VD,36:97,37:$VE,45:119,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{8:$Vs,9:$Vt,10:$Vu,27:123,33:$VC,34:$VD,36:97,37:$VE,45:119,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{8:$Vs,9:$Vt,10:$Vu,27:124,33:$VC,34:$VD,36:97,37:$VE,45:119,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},o($Vn,[2,41]),o($Vo,[2,43]),{36:125,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{9:$VU,11:[1,126],12:[1,127],13:128},{1:[2,3]},o($Vh,[2,8]),{8:$Vs,9:$Vt,10:$Vu,11:$Vv,12:[2,74],26:$Vw,28:$Vx,29:$Vy,30:$Vz,31:$VA,32:$VB,33:$VC,34:$VD,36:97,37:$VE,40:$VF,41:$VG,42:$VH,43:$VI,44:$VJ,45:77,47:130,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,68:78,69:$Ve,70:$Vf,71:$Vg,72:$VP,73:$VQ,74:$VR},o($VV,[2,57]),o($VV,[2,88]),o($VV,[2,89]),o($VV,[2,90]),o($VV,[2,91]),o($VV,$VW),o($VV,[2,106]),o($VV,[2,107]),o($VV,[2,108]),o($VV,[2,109]),o($VV,[2,110]),o($VV,[2,111]),o($VV,[2,112]),o($VV,[2,113]),o($VV,[2,114]),o($VV,[2,115]),o($VV,[2,116]),o($VV,[2,117]),o($VV,[2,118]),o($VV,[2,119]),o($VV,[2,120]),o($VV,[2,93]),o($VV,[2,94]),o($VV,[2,95]),o($VV,[2,96]),o($VV,[2,59]),o($VV,[2,60]),o($VV,[2,61]),o($VV,[2,62]),o($VV,[2,63]),o($VV,[2,64]),o($VV,[2,65]),o($Vm,[2,27]),o($VS,[2,46],{9:[1,131]}),o($VS,[2,49]),{8:$Vs,9:$Vt,10:$Vu,27:132,33:$VC,34:$VD,36:97,37:$VE,45:119,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{9:[1,133]},{9:[1,134]},{9:[1,135]},{9:[1,136]},{9:[1,137]},{9:[1,138]},{8:$Vs,9:$Vt,10:$Vu,28:[1,139],33:$VC,34:$VD,36:97,37:$VE,45:140,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},o($VX,[2,55]),{8:$Vs,9:$Vt,10:$Vu,27:141,33:$VC,34:$VD,36:97,37:$VE,45:119,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{8:$Vs,9:$Vt,10:$Vu,30:[1,142],33:$VC,34:$VD,36:97,37:$VE,45:140,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{8:$Vs,9:$Vt,10:$Vu,32:[1,143],33:$VC,34:$VD,36:97,37:$VE,45:140,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{8:$Vs,9:$Vt,10:$Vu,28:[1,144],33:$VC,34:$VD,36:97,37:$VE,45:140,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{8:$Vs,9:$Vt,10:$Vu,33:[1,145],34:$VD,36:97,37:$VE,45:140,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},o($Vp,[2,45]),o($VY,[2,5]),o($VY,[2,6]),{12:[1,146]},{9:$VU,12:[2,16],13:147},o($VV,[2,58]),o($VS,[2,47]),{8:$Vs,9:$Vt,10:$Vu,33:$VC,34:$VD,36:97,37:$VE,44:[1,148],45:140,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{9:$VZ,37:$V_,56:149,57:$V$,58:$V01,60:150,62:151,63:$V11,64:$V21,65:$V31,66:$V41,67:$V51},{9:$VZ,37:$V_,56:161,57:$V$,58:$V01,60:150,62:151,63:$V11,64:$V21,65:$V31,66:$V41,67:$V51},{9:$VZ,37:$V_,56:162,57:$V$,58:$V01,60:150,62:151,63:$V11,64:$V21,65:$V31,66:$V41,67:$V51},{9:$VZ,37:$V_,56:163,57:$V$,58:$V01,60:150,62:151,63:$V11,64:$V21,65:$V31,66:$V41,67:$V51},{25:164,35:24,36:25,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},{25:165,35:24,36:25,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},o($Vn,[2,29],{9:[1,166]}),o($VX,[2,56]),{8:$Vs,9:$Vt,10:$Vu,30:[1,167],33:$VC,34:$VD,36:97,37:$VE,45:140,48:100,49:$VK,50:$VL,51:$VM,52:$VN,53:$VO,55:79,58:$V7,61:$V9,63:$Va,64:$Vb,66:$Vc,67:$Vd,69:$Ve,70:$Vf,71:$Vg},o($Vn,[2,33],{9:[1,168]}),o($Vn,[2,35],{9:[1,169]}),o($Vn,[2,37],{9:[1,170]}),o([8,9,10,33,34,37,49,50,51,52,53,58,61,63,64,66,67,69,70,71],$VW,{6:$V61,11:$V61,12:$V61,40:$V61,41:$V61,42:$V61,43:$V61}),o($VY,[2,7]),{12:[2,15]},o([9,58,61,63,64,66,67,69,70,71],[2,54]),o($Vm,[2,71],{61:$V71}),o($V81,[2,75],{62:172,9:$VZ,37:$V_,57:$V$,58:$V01,63:$V11,64:$V21,65:$V31,66:$V41,67:$V51}),o($V91,[2,77]),o($V91,[2,79]),o($V91,[2,80]),o($V91,[2,81]),o($V91,[2,82]),o($V91,[2,83]),o($V91,[2,84]),o($V91,[2,85]),o($V91,[2,86]),o($V91,[2,87]),o($Vm,[2,72],{61:$V71}),o($Vm,[2,73],{61:$V71}),o($Vm,[2,68],{61:$V71}),o($Vm,[2,69]),o($Vm,[2,70]),o($Vn,[2,30]),{30:[1,173]},o($Vn,[2,34]),o($Vn,[2,36]),o($Vn,[2,38]),{9:$VZ,37:$V_,57:$V$,58:$V01,60:174,62:151,63:$V11,64:$V21,65:$V31,66:$V41,67:$V51},o($V91,[2,78]),o($Vn,[2,31],{9:[1,175]}),o($V81,[2,76],{62:172,9:$VZ,37:$V_,57:$V$,58:$V01,63:$V11,64:$V21,65:$V31,66:$V41,67:$V51}),o($Vn,[2,32])], -defaultActions: {36:[2,1],73:[2,3],147:[2,15]}, +table: [{3:1,4:2,8:[1,3]},{1:[3]},{5:4,7:5,9:$V0,17:$V1,19:6,20:9,21:10,23:11,24:12,25:13,26:14,27:15,28:17,30:23,38:24,39:25,52:$V2,53:$V3,54:$V4,55:$V5,56:$V6,61:$V7,62:$V8,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{9:[1,35]},{1:[2,2],6:[1,36]},{5:37,19:6,20:9,21:10,23:11,24:12,25:13,26:14,27:15,28:17,30:23,38:24,39:25,52:$V2,53:$V3,54:$V4,55:$V5,56:$V6,61:$V7,62:$V8,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},o($Vh,[2,15],{19:6,20:9,21:10,23:11,24:12,25:13,26:14,27:15,28:17,30:23,38:24,39:25,7:38,5:39,9:$V0,17:$V1,52:$V2,53:$V3,54:$V4,55:$V5,56:$V6,61:$V7,62:$V8,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg}),o($Vi,[2,19],{7:40,9:$V0,17:$V1}),o($Vi,[2,18],{7:41,9:$V0,17:$V1}),{17:[1,42]},{6:$Vj,16:$Vk,17:$Vl,22:43},{6:$Vj,16:$Vk,17:$Vl,22:47},{6:$Vj,16:$Vk,17:$Vl,22:48},{6:$Vj,16:$Vk,17:$Vl,22:49},{6:$Vj,16:$Vk,17:$Vl,22:50},{6:$Vj,16:$Vk,17:$Vl,22:51},{62:[1,52]},o($Vm,[2,33],{29:53,41:54,43:[1,55],44:[1,56],45:[1,57],46:[1,58]}),{9:[1,59]},{9:[1,60]},{9:[1,61]},{9:[1,62]},{9:[1,63]},o($Vn,[2,45],{9:[1,69],12:[1,67],13:[1,68],31:[1,64],34:[1,65],36:[1,66]}),o($Vo,[2,47],{38:24,39:25,30:70,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg}),o($Vp,[2,49],{40:[1,71]}),o($Vq,[2,102]),o($Vq,[2,103]),o($Vq,[2,104]),o($Vq,[2,105]),o($Vq,[2,106]),o($Vq,[2,107]),o($Vq,[2,108]),o($Vq,[2,109]),o($Vq,[2,110]),{10:[1,72],12:[1,73],13:[1,74],14:[1,75],15:[1,76]},{1:[2,1]},{1:[2,4],6:[1,77]},{5:78,19:6,20:9,21:10,23:11,24:12,25:13,26:14,27:15,28:17,30:23,38:24,39:25,52:$V2,53:$V3,54:$V4,55:$V5,56:$V6,61:$V7,62:$V8,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},o($Vh,[2,14]),o($Vi,[2,16]),o($Vi,[2,17]),o($Vr,[2,22]),o($Vr,[2,23]),o($Vr,[2,29]),o($Vr,[2,30]),o($Vr,[2,31]),o($Vr,[2,24]),o($Vr,[2,25]),o($Vr,[2,26]),o($Vr,[2,27]),o($Vr,[2,28]),{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,16:$Vx,31:$Vy,33:$Vz,34:$VA,35:$VB,36:$VC,37:$VD,39:101,40:$VE,43:$VF,44:$VG,45:$VH,46:$VI,47:$VJ,48:81,49:79,50:80,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,71:82,72:$Ve,73:$Vf,74:$Vg,75:$VP,76:$VQ,77:$VR},{28:112,30:23,38:24,39:25,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},o($VS,[2,53],{42:113,9:[1,114],47:[1,115]}),o($VT,[2,55]),o($VT,[2,56]),o($VT,[2,57]),o($VT,[2,58]),{30:116,38:24,39:25,60:[1,117],61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{61:[1,118]},{30:119,38:24,39:25,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{30:120,38:24,39:25,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{30:121,38:24,39:25,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,32:122,39:101,40:$VE,48:123,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,32:125,34:[1,124],39:101,40:$VE,48:123,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,32:126,39:101,40:$VE,48:123,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,32:127,39:101,40:$VE,48:123,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,32:128,39:101,40:$VE,48:123,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},o($Vn,[2,46]),o($Vo,[2,48]),{39:129,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{9:$VU,11:130,16:$VV,17:$VW,18:133},{9:$VU,11:135,16:$VV,17:$VW,18:133},{9:$VU,11:136,16:$VV,17:$VW,18:133},{9:$VU,11:137,16:$VV,17:$VW,18:133},{9:$VU,11:138,16:$VV,17:$VW,18:133},{1:[2,3]},o($Vh,[2,13]),{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,16:$Vx,17:[2,79],31:$Vy,33:$Vz,34:$VA,35:$VB,36:$VC,37:$VD,39:101,40:$VE,43:$VF,44:$VG,45:$VH,46:$VI,47:$VJ,48:81,50:139,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,71:82,72:$Ve,73:$Vf,74:$Vg,75:$VP,76:$VQ,77:$VR},o($VX,[2,62]),o($VX,[2,93]),o($VX,[2,94]),o($VX,[2,95]),o($VX,[2,96]),o($VX,$VY),o($VX,[2,111]),o($VX,[2,112]),o($VX,[2,113]),o($VX,[2,114]),o($VX,[2,115]),o($VX,[2,116]),o($VX,[2,117]),o($VX,[2,118]),o($VX,[2,119]),o($VX,[2,120]),o($VX,[2,121]),o($VX,[2,122]),o($VX,[2,123]),o($VX,[2,124]),o($VX,[2,125]),o($VX,[2,98]),o($VX,[2,99]),o($VX,[2,100]),o($VX,[2,101]),o($VX,[2,64]),o($VX,[2,65]),o($VX,[2,66]),o($VX,[2,67]),o($VX,[2,68]),o($VX,[2,69]),o($VX,[2,70]),o($Vm,[2,32]),o($VS,[2,51],{9:[1,140]}),o($VS,[2,54]),{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,32:141,39:101,40:$VE,48:123,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{9:[1,142]},{9:[1,143]},{9:[1,144]},{9:[1,145]},{9:[1,146]},{9:[1,147]},{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,33:[1,148],39:101,40:$VE,48:149,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},o($VZ,[2,60]),{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,32:150,39:101,40:$VE,48:123,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,35:[1,151],39:101,40:$VE,48:149,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,37:[1,152],39:101,40:$VE,48:149,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,33:[1,153],39:101,40:$VE,48:149,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{8:$Vs,9:$Vt,10:$Vu,12:[1,154],13:$Vw,39:101,40:$VE,48:149,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},o($Vp,[2,50]),o($V_,[2,5]),o($V_,[2,10]),o($V_,[2,11]),{17:[1,155]},{9:$VU,17:[2,21],18:156},o($V_,[2,6]),o($V_,[2,7]),o($V_,[2,8]),o($V_,[2,9]),o($VX,[2,63]),o($VS,[2,52]),{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,39:101,40:$VE,47:[1,157],48:149,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{9:$V$,40:$V01,59:158,60:$V11,61:$V21,63:159,65:160,66:$V31,67:$V41,68:$V51,69:$V61,70:$V71},{9:$V$,40:$V01,59:170,60:$V11,61:$V21,63:159,65:160,66:$V31,67:$V41,68:$V51,69:$V61,70:$V71},{9:$V$,40:$V01,59:171,60:$V11,61:$V21,63:159,65:160,66:$V31,67:$V41,68:$V51,69:$V61,70:$V71},{9:$V$,40:$V01,59:172,60:$V11,61:$V21,63:159,65:160,66:$V31,67:$V41,68:$V51,69:$V61,70:$V71},{30:173,38:24,39:25,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},{30:174,38:24,39:25,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},o($Vn,[2,34],{9:[1,175]}),o($VZ,[2,61]),{8:$Vs,9:$Vt,10:$Vu,12:$Vv,13:$Vw,35:[1,176],39:101,40:$VE,48:149,51:104,52:$VK,53:$VL,54:$VM,55:$VN,56:$VO,58:83,61:$V7,64:$V9,66:$Va,67:$Vb,69:$Vc,70:$Vd,72:$Ve,73:$Vf,74:$Vg},o($Vn,[2,38],{9:[1,177]}),o($Vn,[2,40],{9:[1,178]}),o($Vn,[2,42],{9:[1,179]}),o([8,9,10,12,13,40,52,53,54,55,56,61,64,66,67,69,70,72,73,74],$VY,{6:$V81,16:$V81,17:$V81,43:$V81,44:$V81,45:$V81,46:$V81}),o($V_,[2,12]),{17:[2,20]},o([9,61,64,66,67,69,70,72,73,74],[2,59]),o($Vm,[2,76],{64:$V91}),o($Va1,[2,80],{65:181,9:$V$,40:$V01,60:$V11,61:$V21,66:$V31,67:$V41,68:$V51,69:$V61,70:$V71}),o($Vb1,[2,82]),o($Vb1,[2,84]),o($Vb1,[2,85]),o($Vb1,[2,86]),o($Vb1,[2,87]),o($Vb1,[2,88]),o($Vb1,[2,89]),o($Vb1,[2,90]),o($Vb1,[2,91]),o($Vb1,[2,92]),o($Vm,[2,77],{64:$V91}),o($Vm,[2,78],{64:$V91}),o($Vm,[2,73],{64:$V91}),o($Vm,[2,74]),o($Vm,[2,75]),o($Vn,[2,35]),{35:[1,182]},o($Vn,[2,39]),o($Vn,[2,41]),o($Vn,[2,43]),{9:$V$,40:$V01,60:$V11,61:$V21,63:183,65:160,66:$V31,67:$V41,68:$V51,69:$V61,70:$V71},o($Vb1,[2,83]),o($Vn,[2,36],{9:[1,184]}),o($Va1,[2,81],{65:181,9:$V$,40:$V01,60:$V11,61:$V21,66:$V31,67:$V41,68:$V51,69:$V61,70:$V71}),o($Vn,[2,37])], +defaultActions: {36:[2,1],77:[2,3],156:[2,20]}, parseError: function parseError(str, hash) { if (hash.recoverable) { this.trace(str); @@ -671,15 +680,15 @@ options: {}, performAction: function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) { var YYSTATE=YY_START; switch($avoiding_name_collisions) { -case 0:return 49; +case 0:return 52; break; -case 1:return 50; +case 1:return 53; break; -case 2:return 51; +case 2:return 54; break; -case 3:return 52; +case 3:return 55; break; -case 4:return 53; +case 4:return 56; break; case 5:return 8; break; @@ -695,70 +704,74 @@ case 10:return 10; break; case 11:return 10; break; -case 12:return 58; +case 12:return 61; break; -case 13:return 66; +case 13:return 69; break; -case 14:return 64; +case 14:return 67; break; -case 15:return 11; +case 15:return 16; break; -case 16:return 61; +case 16:return 64; break; -case 17:return 70; +case 17:return 73; break; -case 18:return 71; +case 18:return 74; break; -case 19:return 67; +case 19:return 70; break; -case 20:return 34; +case 20:return 13; break; -case 21:return 33; +case 21:return 12; break; -case 22:return 42; +case 22:return 14 break; -case 23:return 40; +case 23:return 15 break; -case 24:return 41; +case 24:return 45; break; case 25:return 43; break; -case 26:return 37; +case 26:return 44; break; -case 27:return 69; +case 27:return 46; break; -case 28:return 59; +case 28:return 40; break; -case 29:return 70; +case 29:return 72; break; -case 30:return 63; +case 30:return 62; break; -case 31:return 44; +case 31:return 73; break; -case 32:return 29; +case 32:return 66; break; -case 33:return 30; +case 33:return 47; break; -case 34:return 26; +case 34:return 34; break; -case 35:return 28; +case 35:return 35; break; -case 36:return 31 +case 36:return 31; break; -case 37:return 32 +case 37:return 33; break; -case 38:return 74; +case 38:return 36 break; -case 39:return 12; +case 39:return 37 break; -case 40:return 9; +case 40:return 77; break; -case 41:return 6; +case 41:return 17; +break; +case 42:return 9; +break; +case 43:return 6; break; } }, -rules: [/^(?:style\b)/,/^(?:linkStyle\b)/,/^(?:classDef\b)/,/^(?:class\b)/,/^(?:click\b)/,/^(?:graph\b)/,/^(?:LR\b)/,/^(?:RL\b)/,/^(?:TB\b)/,/^(?:BT\b)/,/^(?:TD\b)/,/^(?:BR\b)/,/^(?:[0-9])/,/^(?:#)/,/^(?::)/,/^(?:;)/,/^(?:,)/,/^(?:=)/,/^(?:\*)/,/^(?:\.)/,/^(?:<)/,/^(?:>)/,/^(?:--[x])/,/^(?:-->)/,/^(?:--[o])/,/^(?:---)/,/^(?:-)/,/^(?:\+)/,/^(?:%)/,/^(?:=)/,/^(?:[\u0021-\u0027\u002A-\u002E\u003F\u0041-\u005A\u0061-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6]|[\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377]|[\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5]|[\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA]|[\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE]|[\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA]|[\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0]|[\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977]|[\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2]|[\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A]|[\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39]|[\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8]|[\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C]|[\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C]|[\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99]|[\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0]|[\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D]|[\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3]|[\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10]|[\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1]|[\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81]|[\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3]|[\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6]|[\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A]|[\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081]|[\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D]|[\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0]|[\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310]|[\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C]|[\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711]|[\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7]|[\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C]|[\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16]|[\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF]|[\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC]|[\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D]|[\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D]|[\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3]|[\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F]|[\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128]|[\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184]|[\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3]|[\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6]|[\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE]|[\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C]|[\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D]|[\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC]|[\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B]|[\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788]|[\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805]|[\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB]|[\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28]|[\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5]|[\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4]|[\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E]|[\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D]|[\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36]|[\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D]|[\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC]|[\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF]|[\uFFD2-\uFFD7\uFFDA-\uFFDC_\/])/,/^(?:\|)/,/^(?:\()/,/^(?:\))/,/^(?:\[)/,/^(?:\])/,/^(?:\{)/,/^(?:\})/,/^(?:")/,/^(?:\n)/,/^(?:\s)/,/^(?:$)/], -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],"inclusive":true}} +rules: [/^(?:style\b)/,/^(?:linkStyle\b)/,/^(?:classDef\b)/,/^(?:class\b)/,/^(?:click\b)/,/^(?:graph\b)/,/^(?:LR\b)/,/^(?:RL\b)/,/^(?:TB\b)/,/^(?:BT\b)/,/^(?:TD\b)/,/^(?:BR\b)/,/^(?:[0-9])/,/^(?:#)/,/^(?::)/,/^(?:;)/,/^(?:,)/,/^(?:=)/,/^(?:\*)/,/^(?:\.)/,/^(?:<)/,/^(?:>)/,/^(?:\^)/,/^(?:v\b)/,/^(?:--[x])/,/^(?:-->)/,/^(?:--[o])/,/^(?:---)/,/^(?:-)/,/^(?:\+)/,/^(?:%)/,/^(?:=)/,/^(?:[\u0021-\u0027\u002A-\u002E\u003F\u0041-\u005A\u0061-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6]|[\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377]|[\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5]|[\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA]|[\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE]|[\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA]|[\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0]|[\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977]|[\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2]|[\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A]|[\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39]|[\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8]|[\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C]|[\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C]|[\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99]|[\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0]|[\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D]|[\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3]|[\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10]|[\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1]|[\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81]|[\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3]|[\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6]|[\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A]|[\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081]|[\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D]|[\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0]|[\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310]|[\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C]|[\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711]|[\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7]|[\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C]|[\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16]|[\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF]|[\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC]|[\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D]|[\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D]|[\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3]|[\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F]|[\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128]|[\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184]|[\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3]|[\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6]|[\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE]|[\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C]|[\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D]|[\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC]|[\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B]|[\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788]|[\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805]|[\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB]|[\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28]|[\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5]|[\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4]|[\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E]|[\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D]|[\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36]|[\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D]|[\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC]|[\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF]|[\uFFD2-\uFFD7\uFFDA-\uFFDC_\/])/,/^(?:\|)/,/^(?:\()/,/^(?:\))/,/^(?:\[)/,/^(?:\])/,/^(?:\{)/,/^(?:\})/,/^(?:")/,/^(?:\n)/,/^(?:\s)/,/^(?:$)/], +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],"inclusive":true}} }); return lexer; })(); diff --git a/src/diagrams/flowchart/parser/flow.spec.js b/src/diagrams/flowchart/parser/flow.spec.js index bf6d0337e..9407fad71 100644 --- a/src/diagrams/flowchart/parser/flow.spec.js +++ b/src/diagrams/flowchart/parser/flow.spec.js @@ -30,6 +30,84 @@ describe('when parsing ',function(){ expect(edges[0].text).toBe(''); }); + it('should handle angle bracket '>' as direction LR',function(){ + var res = flow.parser.parse('graph >;A-->B;'); + + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + var direction = flow.parser.yy.getDirection(); + + expect(direction).toBe('LR'); + + expect(vert['A'].id).toBe('A'); + expect(vert['B'].id).toBe('B'); + expect(edges.length).toBe(1); + expect(edges[0].start).toBe('A'); + expect(edges[0].end).toBe('B'); + expect(edges[0].type).toBe('arrow'); + expect(edges[0].text).toBe(''); + }); + + it('should handle angle bracket '<' as direction RL',function(){ + var res = flow.parser.parse('graph <;A-->B;'); + + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + var direction = flow.parser.yy.getDirection(); + + expect(direction).toBe('RL'); + + expect(vert['A'].id).toBe('A'); + expect(vert['B'].id).toBe('B'); + expect(edges.length).toBe(1); + expect(edges[0].start).toBe('A'); + expect(edges[0].end).toBe('B'); + expect(edges[0].type).toBe('arrow'); + expect(edges[0].text).toBe(''); + }); + + + it('should handle caret '^' as direction BT',function(){ + var res = flow.parser.parse('graph ^;A-->B;'); + + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + var direction = flow.parser.yy.getDirection(); + + expect(direction).toBe('BT'); + + expect(vert['A'].id).toBe('A'); + expect(vert['B'].id).toBe('B'); + expect(edges.length).toBe(1); + expect(edges[0].start).toBe('A'); + expect(edges[0].end).toBe('B'); + expect(edges[0].type).toBe('arrow'); + expect(edges[0].text).toBe(''); + }); + + + it('should handle lower-case \'v\' as direction TB',function(){ + var res = flow.parser.parse('graph v;A-->B;'); + + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + var direction = flow.parser.yy.getDirection(); + + expect(direction).toBe('TB'); + + expect(vert['A'].id).toBe('A'); + expect(vert['B'].id).toBe('B'); + expect(edges.length).toBe(1); + expect(edges[0].start).toBe('A'); + expect(edges[0].end).toBe('B'); + expect(edges[0].type).toBe('arrow'); + expect(edges[0].text).toBe(''); + }); + it('should handle a nodes and edges and a space between link and node',function(){ var res = flow.parser.parse('graph TD;A --> B;');