From 26d0908b2736bc965777be06fe1296934983d4c5 Mon Sep 17 00:00:00 2001 From: knsv Date: Sat, 27 Dec 2014 09:46:28 +0100 Subject: [PATCH] Fix for issue #53 --- src/diagrams/flowchart/parser/flow.jison | 11 +- src/diagrams/flowchart/parser/flow.js | 123 ++++---- src/diagrams/flowchart/parser/flow.spec.js | 308 ++++++++++++++------- 3 files changed, 285 insertions(+), 157 deletions(-) diff --git a/src/diagrams/flowchart/parser/flow.jison b/src/diagrams/flowchart/parser/flow.jison index f13dca2d59..08f7b8d8a2 100644 --- a/src/diagrams/flowchart/parser/flow.jison +++ b/src/diagrams/flowchart/parser/flow.jison @@ -26,12 +26,13 @@ "." return 'DOT'; "<" return 'TAGSTART'; ">" return 'TAGEND'; -"^" return 'UP' -"v" return 'DOWN' +"^" return 'UP'; +"v" return 'DOWN'; \-\-[x] return 'ARROW_CROSS'; \-\-\> return 'ARROW_POINT'; \-\-[o] return 'ARROW_CIRCLE'; \-\-\- return 'ARROW_OPEN'; +\-\- return '--'; \- return 'MINUS'; \+ return 'PLUS'; \% return 'PCT'; @@ -235,6 +236,12 @@ link: linkStatement arrowText {$$ = $1;} | linkStatement SPACE {$$ = $1;} + | '--' SPACE text SPACE linkStatement + {$5.text = $3;$$ = $5;} + | '--' SPACE text SPACE linkStatement SPACE + {$5.text = $3;$$ = $5;} + | '--' text linkStatement SPACE + {$5.text = $3;$$ = $5;} ; linkStatement: ARROW_POINT diff --git a/src/diagrams/flowchart/parser/flow.js b/src/diagrams/flowchart/parser/flow.js index 76e7209ce7..c4afc7933c 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=[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 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=[53,54,55,56,57,62,63,65,67,68,70,71,73,74,75],$Vj=[1,46],$Vk=[1,45],$Vl=[1,44],$Vm=[6,16,17],$Vn=[1,56],$Vo=[1,57],$Vp=[1,58],$Vq=[1,59],$Vr=[6,16,17,43,44,45,46,47],$Vs=[6,9,12,13,16,17,31,34,36,43,44,45,46,47],$Vt=[6,9,12,13,16,17,31,34,36,43,44,45,46,47,62,65,67,68,70,71,73,74,75],$Vu=[6,8,9,10,12,13,16,17,31,33,34,35,36,37,40,43,44,45,46,47,48,53,54,55,56,57,62,65,67,68,70,71,73,74,75,76,77,78],$Vv=[1,6,9,17,53,54,55,56,57,62,63,65,67,68,70,71,73,74,75],$Vw=[1,111],$Vx=[1,103],$Vy=[1,112],$Vz=[1,86],$VA=[1,85],$VB=[1,101],$VC=[1,90],$VD=[1,91],$VE=[1,88],$VF=[1,89],$VG=[1,92],$VH=[1,93],$VI=[1,104],$VJ=[1,97],$VK=[1,98],$VL=[1,96],$VM=[1,99],$VN=[1,87],$VO=[1,106],$VP=[1,107],$VQ=[1,108],$VR=[1,109],$VS=[1,110],$VT=[1,94],$VU=[1,95],$VV=[1,100],$VW=[62,65,67,68,70,71,73,74,75],$VX=[9,48,62,65,67,68,70,71,73,74,75],$VY=[1,137],$VZ=[1,134],$V_=[1,135],$V$=[8,9,10,12,13,16,17,31,33,34,35,36,37,40,44,45,46,47,48,53,54,55,56,57,62,65,67,68,70,71,73,74,75,76,77,78],$V01=[2,100],$V11=[2,102],$V21=[8,9,10,12,13,33,35,37,40,44,45,46,47,48,53,54,55,56,57,62,65,67,68,70,71,73,74,75],$V31=[9,17,53,54,55,56,57,62,63,65,67,68,70,71,73,74,75],$V41=[1,173],$V51=[1,170],$V61=[1,174],$V71=[1,171],$V81=[1,168],$V91=[1,169],$Va1=[1,172],$Vb1=[1,175],$Vc1=[1,176],$Vd1=[8,9,10,12,13,40,53,54,55,56,57,62,65,67,68,70,71,73,74,75],$Ve1=[2,44],$Vf1=[1,188],$Vg1=[6,16,17,65],$Vh1=[6,9,16,17,40,61,62,65,67,68,69,70,71]; 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,"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]], +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,"--":43,"ARROW_POINT":44,"ARROW_CIRCLE":45,"ARROW_CROSS":46,"ARROW_OPEN":47,"PIPE":48,"textToken":49,"commentText":50,"commentToken":51,"keywords":52,"STYLE":53,"LINKSTYLE":54,"CLASSDEF":55,"CLASS":56,"CLICK":57,"textNoTags":58,"textNoTagsToken":59,"stylesOpt":60,"HEX":61,"NUM":62,"PCT":63,"style":64,"COMMA":65,"styleComponent":66,"ALPHA":67,"COLON":68,"UNIT":69,"BRKT":70,"DOT":71,"graphCodeTokens":72,"PLUS":73,"EQUALS":74,"MULT":75,"TAG_START":76,"TAG_END":77,"QUOTE":78,"$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:"--",44:"ARROW_POINT",45:"ARROW_CIRCLE",46:"ARROW_CROSS",47:"ARROW_OPEN",48:"PIPE",53:"STYLE",54:"LINKSTYLE",55:"CLASSDEF",56:"CLASS",57:"CLICK",61:"HEX",62:"NUM",63:"PCT",65:"COMMA",67:"ALPHA",68:"COLON",69:"UNIT",70:"BRKT",71:"DOT",73:"PLUS",74:"EQUALS",75:"MULT",76:"TAG_START",77:"TAG_END",78:"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],[29,5],[29,6],[29,4],[41,1],[41,1],[41,1],[41,1],[42,3],[32,1],[32,2],[50,1],[50,2],[52,1],[52,1],[52,1],[52,1],[52,1],[52,1],[52,1],[58,1],[58,2],[25,5],[26,5],[27,5],[23,5],[23,5],[24,5],[20,3],[60,1],[60,3],[64,1],[64,2],[66,1],[66,1],[66,1],[66,1],[66,1],[66,1],[66,1],[66,1],[66,1],[51,1],[51,1],[49,1],[49,1],[49,1],[59,1],[59,1],[59,1],[59,1],[39,1],[39,1],[39,1],[39,1],[39,1],[39,1],[39,1],[39,1],[39,1],[72,1],[72,1],[72,1],[72,1],[72,1],[72,1],[72,1],[72,1],[72,1],[72,1],[72,1],[72,1],[72,1],[72,1],[72,1]], performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) { /* this == yyval */ @@ -146,10 +146,10 @@ break; case 46: this.$ = $$[$0-1];yy.addVertex($$[$0-1]); break; -case 47: case 49: case 60: case 62: case 71: +case 47: case 49: case 63: case 65: case 74: this.$=$$[$0]; break; -case 48: case 61: case 63: case 72: +case 48: case 64: case 66: case 75: this.$=$$[$0-1]+''+$$[$0]; break; case 50: @@ -164,49 +164,58 @@ break; case 53: this.$ = $$[$0]; break; -case 54: case 59: +case 54: case 62: this.$ = $$[$0-1]; break; case 55: -this.$ = {"type":"arrow"}; +$$[$0].text = $$[$0-2];this.$ = $$[$0]; break; case 56: -this.$ = {"type":"arrow_circle"}; +$$[$0-1].text = $$[$0-3];this.$ = $$[$0-1]; break; case 57: -this.$ = {"type":"arrow_cross"}; +$$[$01].text = $$[$0-1];this.$ = $$[$01]; break; case 58: +this.$ = {"type":"arrow"}; +break; +case 59: +this.$ = {"type":"arrow_circle"}; +break; +case 60: +this.$ = {"type":"arrow_cross"}; +break; +case 61: this.$ = {"type":"arrow_open"}; break; -case 73: +case 76: this.$ = $$[$0-4];yy.addClass($$[$0-2],$$[$0]); break; -case 74: +case 77: this.$ = $$[$0-4];yy.setClass($$[$0-2], $$[$0]); break; -case 75: +case 78: this.$ = $$[$0-4];yy.setClickEvent($$[$0-2], $$[$0]); break; -case 76: +case 79: this.$ = $$[$0-4];yy.addVertex($$[$0-2],undefined,undefined,$$[$0]); break; -case 77: case 78: +case 80: case 81: this.$ = $$[$0-4];yy.updateLink($$[$0-2],$$[$0]); break; -case 80: +case 83: this.$ = [$$[$0]] break; -case 81: +case 84: $$[$0-2].push($$[$0]);this.$ = $$[$0-2]; break; -case 83: +case 86: this.$ = $$[$0-1] + $$[$0]; break; } }, -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]}, +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,53:$V2,54:$V3,55:$V4,56:$V5,57:$V6,62:$V7,63:$V8,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$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,53:$V2,54:$V3,55:$V4,56:$V5,57:$V6,62:$V7,63:$V8,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$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,53:$V2,54:$V3,55:$V4,56:$V5,57:$V6,62:$V7,63:$V8,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$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},{63:[1,52]},o($Vm,[2,33],{29:53,41:54,43:[1,55],44:$Vn,45:$Vo,46:$Vp,47:$Vq}),{9:[1,60]},{9:[1,61]},{9:[1,62]},{9:[1,63]},{9:[1,64]},o($Vr,[2,45],{9:[1,70],12:[1,68],13:[1,69],31:[1,65],34:[1,66],36:[1,67]}),o($Vs,[2,47],{38:24,39:25,30:71,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg}),o($Vt,[2,49],{40:[1,72]}),o($Vu,[2,105]),o($Vu,[2,106]),o($Vu,[2,107]),o($Vu,[2,108]),o($Vu,[2,109]),o($Vu,[2,110]),o($Vu,[2,111]),o($Vu,[2,112]),o($Vu,[2,113]),{10:[1,73],12:[1,74],13:[1,75],14:[1,76],15:[1,77]},{1:[2,1]},{1:[2,4],6:[1,78]},{5:79,19:6,20:9,21:10,23:11,24:12,25:13,26:14,27:15,28:17,30:23,38:24,39:25,53:$V2,54:$V3,55:$V4,56:$V5,57:$V6,62:$V7,63:$V8,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},o($Vh,[2,14]),o($Vi,[2,16]),o($Vi,[2,17]),o($Vv,[2,22]),o($Vv,[2,23]),o($Vv,[2,29]),o($Vv,[2,30]),o($Vv,[2,31]),o($Vv,[2,24]),o($Vv,[2,25]),o($Vv,[2,26]),o($Vv,[2,27]),o($Vv,[2,28]),{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,16:$VB,31:$VC,33:$VD,34:$VE,35:$VF,36:$VG,37:$VH,39:102,40:$VI,44:$VJ,45:$VK,46:$VL,47:$VM,48:$VN,49:82,50:80,51:81,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,72:83,73:$Ve,74:$Vf,75:$Vg,76:$VT,77:$VU,78:$VV},{28:113,30:23,38:24,39:25,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},o($VW,[2,53],{42:114,9:[1,115],48:[1,116]}),{8:$Vw,9:[1,117],10:$Vy,12:$Vz,13:$VA,32:118,39:102,40:$VI,49:119,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},o($VX,[2,58]),o($VX,[2,59]),o($VX,[2,60]),o($VX,[2,61]),{30:120,38:24,39:25,61:[1,121],62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{62:[1,122]},{30:123,38:24,39:25,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{30:124,38:24,39:25,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{30:125,38:24,39:25,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,32:126,39:102,40:$VI,49:119,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,32:128,34:[1,127],39:102,40:$VI,49:119,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,32:129,39:102,40:$VI,49:119,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,32:130,39:102,40:$VI,49:119,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,32:131,39:102,40:$VI,49:119,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},o($Vr,[2,46]),o($Vs,[2,48]),{39:132,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{9:$VY,11:133,16:$VZ,17:$V_,18:136},{9:$VY,11:138,16:$VZ,17:$V_,18:136},{9:$VY,11:139,16:$VZ,17:$V_,18:136},{9:$VY,11:140,16:$VZ,17:$V_,18:136},{9:$VY,11:141,16:$VZ,17:$V_,18:136},{1:[2,3]},o($Vh,[2,13]),{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,16:$VB,17:[2,82],31:$VC,33:$VD,34:$VE,35:$VF,36:$VG,37:$VH,39:102,40:$VI,44:$VJ,45:$VK,46:$VL,47:$VM,48:$VN,49:82,51:142,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,72:83,73:$Ve,74:$Vf,75:$Vg,76:$VT,77:$VU,78:$VV},o($V$,[2,65]),o($V$,[2,96]),o($V$,[2,97]),o($V$,[2,98]),o($V$,[2,99]),o($V$,$V01),o($V$,[2,114]),o($V$,[2,115]),o($V$,[2,116]),o($V$,[2,117]),o($V$,[2,118]),o($V$,[2,119]),o($V$,[2,120]),o($V$,[2,121]),o($V$,[2,122]),o($V$,[2,123]),o($V$,[2,124]),o($V$,[2,125]),o($V$,[2,126]),o($V$,[2,127]),o($V$,[2,128]),o($V$,[2,101]),o($V$,$V11),o($V$,[2,103]),o($V$,[2,104]),o($V$,[2,67]),o($V$,[2,68]),o($V$,[2,69]),o($V$,[2,70]),o($V$,[2,71]),o($V$,[2,72]),o($V$,[2,73]),o($Vm,[2,32]),o($VW,[2,51],{9:[1,143]}),o($VW,[2,54]),{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,32:144,39:102,40:$VI,49:119,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},o([44,45,46,47],$V11,{59:84,39:102,52:105,49:119,32:145,8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,40:$VI,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg}),{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,39:102,40:$VI,41:146,44:$Vn,45:$Vo,46:$Vp,47:$Vq,49:147,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},o($V21,[2,63]),{9:[1,148]},{9:[1,149]},{9:[1,150]},{9:[1,151]},{9:[1,152]},{9:[1,153]},{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,33:[1,154],39:102,40:$VI,49:147,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,32:155,39:102,40:$VI,49:119,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,35:[1,156],39:102,40:$VI,49:147,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,37:[1,157],39:102,40:$VI,49:147,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,33:[1,158],39:102,40:$VI,49:147,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{8:$Vw,9:$Vx,10:$Vy,12:[1,159],13:$VA,39:102,40:$VI,49:147,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},o($Vt,[2,50]),o($V31,[2,5]),o($V31,[2,10]),o($V31,[2,11]),{17:[1,160]},{9:$VY,17:[2,21],18:161},o($V31,[2,6]),o($V31,[2,7]),o($V31,[2,8]),o($V31,[2,9]),o($V$,[2,66]),o($VW,[2,52]),{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,39:102,40:$VI,48:[1,162],49:147,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{8:$Vw,9:[1,163],10:$Vy,12:$Vz,13:$VA,39:102,40:$VI,49:147,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{9:[1,164]},o($V21,[2,64]),{9:$V41,40:$V51,60:165,61:$V61,62:$V71,64:166,66:167,67:$V81,68:$V91,69:$Va1,70:$Vb1,71:$Vc1},{9:$V41,40:$V51,60:177,61:$V61,62:$V71,64:166,66:167,67:$V81,68:$V91,69:$Va1,70:$Vb1,71:$Vc1},{9:$V41,40:$V51,60:178,61:$V61,62:$V71,64:166,66:167,67:$V81,68:$V91,69:$Va1,70:$Vb1,71:$Vc1},{9:$V41,40:$V51,60:179,61:$V61,62:$V71,64:166,66:167,67:$V81,68:$V91,69:$Va1,70:$Vb1,71:$Vc1},{30:180,38:24,39:25,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},{30:181,38:24,39:25,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},o($Vr,[2,34],{9:[1,182]}),{8:$Vw,9:$Vx,10:$Vy,12:$Vz,13:$VA,35:[1,183],39:102,40:$VI,49:147,52:105,53:$VO,54:$VP,55:$VQ,56:$VR,57:$VS,59:84,62:$V7,65:$V9,67:$Va,68:$Vb,70:$Vc,71:$Vd,73:$Ve,74:$Vf,75:$Vg},o($Vr,[2,38],{9:[1,184]}),o($Vr,[2,40],{9:[1,185]}),o($Vr,[2,42],{9:[1,186]}),o($Vd1,$V01,{6:$Ve1,16:$Ve1,17:$Ve1,43:$Ve1,44:$Ve1,45:$Ve1,46:$Ve1,47:$Ve1}),o($V31,[2,12]),{17:[2,20]},o([9,62,65,67,68,70,71,73,74,75],[2,62]),o($Vd1,$V11,{41:187,44:$Vn,45:$Vo,46:$Vp,47:$Vq}),o($VW,[2,57]),o($Vm,[2,79],{65:$Vf1}),o($Vg1,[2,83],{66:189,9:$V41,40:$V51,61:$V61,62:$V71,67:$V81,68:$V91,69:$Va1,70:$Vb1,71:$Vc1}),o($Vh1,[2,85]),o($Vh1,[2,87]),o($Vh1,[2,88]),o($Vh1,[2,89]),o($Vh1,[2,90]),o($Vh1,[2,91]),o($Vh1,[2,92]),o($Vh1,[2,93]),o($Vh1,[2,94]),o($Vh1,[2,95]),o($Vm,[2,80],{65:$Vf1}),o($Vm,[2,81],{65:$Vf1}),o($Vm,[2,76],{65:$Vf1}),o($Vm,[2,77]),o($Vm,[2,78]),o($Vr,[2,35]),{35:[1,190]},o($Vr,[2,39]),o($Vr,[2,41]),o($Vr,[2,43]),o($VW,[2,55],{9:[1,191]}),{9:$V41,40:$V51,61:$V61,62:$V71,64:192,66:167,67:$V81,68:$V91,69:$Va1,70:$Vb1,71:$Vc1},o($Vh1,[2,86]),o($Vr,[2,36],{9:[1,193]}),o($VW,[2,56]),o($Vg1,[2,84],{66:189,9:$V41,40:$V51,61:$V61,62:$V71,67:$V81,68:$V91,69:$Va1,70:$Vb1,71:$Vc1}),o($Vr,[2,37])], +defaultActions: {36:[2,1],78:[2,3],161:[2,20]}, parseError: function parseError(str, hash) { if (hash.recoverable) { this.trace(str); @@ -680,15 +689,15 @@ options: {}, performAction: function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) { var YYSTATE=YY_START; switch($avoiding_name_collisions) { -case 0:return 52; +case 0:return 53; break; -case 1:return 53; +case 1:return 54; break; -case 2:return 54; +case 2:return 55; break; -case 3:return 55; +case 3:return 56; break; -case 4:return 56; +case 4:return 57; break; case 5:return 8; break; @@ -704,74 +713,76 @@ case 10:return 10; break; case 11:return 10; break; -case 12:return 61; +case 12:return 62; break; -case 13:return 69; +case 13:return 70; break; -case 14:return 67; +case 14:return 68; break; case 15:return 16; break; -case 16:return 64; +case 16:return 65; break; -case 17:return 73; +case 17:return 74; break; -case 18:return 74; +case 18:return 75; break; -case 19:return 70; +case 19:return 71; break; case 20:return 13; break; case 21:return 12; break; -case 22:return 14 +case 22:return 14; +break; +case 23:return 15; break; -case 23:return 15 +case 24:return 46; break; -case 24:return 45; +case 25:return 44; break; -case 25:return 43; +case 26:return 45; break; -case 26:return 44; +case 27:return 47; break; -case 27:return 46; +case 28:return 43; break; -case 28:return 40; +case 29:return 40; break; -case 29:return 72; +case 30:return 73; break; -case 30:return 62; +case 31:return 63; break; -case 31:return 73; +case 32:return 74; break; -case 32:return 66; +case 33:return 67; break; -case 33:return 47; +case 34:return 48; break; -case 34:return 34; +case 35:return 34; break; -case 35:return 35; +case 36:return 35; break; -case 36:return 31; +case 37:return 31; break; -case 37:return 33; +case 38:return 33; break; -case 38:return 36 +case 39:return 36 break; -case 39:return 37 +case 40:return 37 break; -case 40:return 77; +case 41:return 78; break; -case 41:return 17; +case 42:return 17; break; -case 42:return 9; +case 43:return 9; break; -case 43:return 6; +case 44: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])/,/^(?:#)/,/^(?::)/,/^(?:;)/,/^(?:,)/,/^(?:=)/,/^(?:\*)/,/^(?:\.)/,/^(?:<)/,/^(?:>)/,/^(?:\^)/,/^(?:v\b)/,/^(?:--[x])/,/^(?:-->)/,/^(?:--[o])/,/^(?:---)/,/^(?:-)/,/^(?:\+)/,/^(?:%)/,/^(?:=)/,/^(?:[\u0021-\u0027\u002A-\u002E\u003F\u0041-\u005A\u005C\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}} +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\u005C\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,44],"inclusive":true}} }); return lexer; })(); diff --git a/src/diagrams/flowchart/parser/flow.spec.js b/src/diagrams/flowchart/parser/flow.spec.js index 04946e742d..8eb87581b1 100644 --- a/src/diagrams/flowchart/parser/flow.spec.js +++ b/src/diagrams/flowchart/parser/flow.spec.js @@ -249,87 +249,193 @@ describe('when parsing ',function(){ expect(edges[0].type).toBe('arrow_circle'); }); - it('should handle text on edges without space',function(){ - var res = flow.parser.parse('graph TD;A--x|textNoSpace|B;'); + describe("it should handle text on edges",function(){ + it('it should handle text without space',function(){ + var res = flow.parser.parse('graph TD;A--x|textNoSpace|B;'); - var vert = flow.parser.yy.getVertices(); - var edges = flow.parser.yy.getEdges(); + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); - expect(edges[0].type).toBe('arrow_cross'); - }); + expect(edges[0].type).toBe('arrow_cross'); + }); - it('should handle text on edges without space and space between vertices and link',function(){ - var res = flow.parser.parse('graph TD;A --x|textNoSpace| B;'); + it('should handle with space',function(){ + var res = flow.parser.parse('graph TD;A--x|text including space|B;'); - var vert = flow.parser.yy.getVertices(); - var edges = flow.parser.yy.getEdges(); + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); - expect(edges[0].type).toBe('arrow_cross'); - }); + expect(edges[0].type).toBe('arrow_cross'); + }); - it('should handle text on edges with space',function(){ - var res = flow.parser.parse('graph TD;A--x|text including space|B;'); + it('it should handle text with /',function(){ + var res = flow.parser.parse('graph TD;A--x|text with / should work|B;'); - var vert = flow.parser.yy.getVertices(); - var edges = flow.parser.yy.getEdges(); + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); - expect(edges[0].type).toBe('arrow_cross'); - }); + expect(edges[0].text).toBe('text with / should work'); + }); - it('should handle text on edges with space',function(){ - var res = flow.parser.parse('graph TD;A--x|text with / should work|B;'); + it('it should handle space and space between vertices and link',function(){ + var res = flow.parser.parse('graph TD;A --x|textNoSpace| B;'); - var vert = flow.parser.yy.getVertices(); - var edges = flow.parser.yy.getEdges(); + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); - expect(edges[0].text).toBe('text with / should work'); - }); + expect(edges[0].type).toBe('arrow_cross'); + }); - it('should handle text on edges with space CAPS',function(){ - var res = flow.parser.parse('graph TD;A--x|text including CAPS space|B;'); + it('should handle space and CAPS',function(){ + var res = flow.parser.parse('graph TD;A--x|text including CAPS space|B;'); - var vert = flow.parser.yy.getVertices(); - var edges = flow.parser.yy.getEdges(); + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); - expect(edges[0].type).toBe('arrow_cross'); - }); - it('should handle text on edges with space dir',function(){ - var res = flow.parser.parse('graph TD;A--x|text including URL space|B;'); + expect(edges[0].type).toBe('arrow_cross'); + }); - var vert = flow.parser.yy.getVertices(); - var edges = flow.parser.yy.getEdges(); + it('should handle space and dir',function(){ + var res = flow.parser.parse('graph TD;A--x|text including URL space|B;'); + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); - expect(edges[0].type).toBe('arrow_cross'); - expect(edges[0].text).toBe('text including URL space'); - }); + expect(edges[0].type).toBe('arrow_cross'); + expect(edges[0].text).toBe('text including URL space'); - it('should handle text on edges with space dir',function(){ - var res = flow.parser.parse('graph TD;A--x|text including R TD space|B;'); + }); - var vert = flow.parser.yy.getVertices(); - var edges = flow.parser.yy.getEdges(); + it('should handle space and dir (TD)',function(){ + var res = flow.parser.parse('graph TD;A--x|text including R TD space|B;'); + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); - expect(edges[0].type).toBe('arrow_cross'); - expect(edges[0].text).toBe('text including R TD space'); + + expect(edges[0].type).toBe('arrow_cross'); + expect(edges[0].text).toBe('text including R TD space'); + + }); + it('should handle keywords',function(){ + var res = flow.parser.parse('graph TD;A--x|text including graph space|B;'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + expect(edges[0].text).toBe('text including graph space'); + + }); }); - it('should handle text on edges with graph keyword',function(){ - var res = flow.parser.parse('graph TD;A--x|text including graph space|B;'); - var vert = flow.parser.yy.getVertices(); - var edges = flow.parser.yy.getEdges(); - expect(edges[0].text).toBe('text including graph space'); + describe("it should handle text on edges using the new notation",function(){ + it('it should handle text without space',function(){ + var res = flow.parser.parse('graph TD;A-- textNoSpace --xB;'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + + expect(edges[0].type).toBe('arrow_cross'); + }); + + it('it should handle text with multiple leading space',function(){ + var res = flow.parser.parse('graph TD;A-- textNoSpace --xB;'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + + expect(edges[0].type).toBe('arrow_cross'); + }); + + + it('should handle with space',function(){ + var res = flow.parser.parse('graph TD;A-- text including space --xB;'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + + expect(edges[0].type).toBe('arrow_cross'); + }); + + it('it should handle text with /',function(){ + var res = flow.parser.parse('graph TD;A -- text with / should work --x B;'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + + expect(edges[0].text).toBe('text with / should work'); + }); + + it('it should handle space and space between vertices and link',function(){ + var res = flow.parser.parse('graph TD;A -- textNoSpace --x B;'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + + expect(edges[0].type).toBe('arrow_cross'); + }); + + it('should handle space and CAPS',function(){ + var res = flow.parser.parse('graph TD;A-- text including CAPS space --xB;'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + + expect(edges[0].type).toBe('arrow_cross'); + }); + + it('should handle space and dir',function(){ + var res = flow.parser.parse('graph TD;A-- text including URL space --xB;'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + + expect(edges[0].type).toBe('arrow_cross'); + expect(edges[0].text).toBe('text including URL space'); + + }); + + it('should handle space and dir (TD)',function(){ + var res = flow.parser.parse('graph TD;A-- text including R TD space --xB;'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + + expect(edges[0].type).toBe('arrow_cross'); + expect(edges[0].text).toBe('text including R TD space'); + + }); + it('should handle keywords',function(){ + var res = flow.parser.parse('graph TD;A-- text including graph space --xB;'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + expect(edges[0].text).toBe('text including graph space'); + + }); }); + + + + it('should handle multi-line text',function(){ var res = flow.parser.parse('graph TD;A--o|text space|B;\n B-->|more text with space|C;'); @@ -350,6 +456,7 @@ describe('when parsing ',function(){ expect(edges[1].text).toBe('more text with space'); }); + it('should handle multiple edges',function(){ var res = flow.parser.parse('graph TD;A---|This is the 123 s text|B;\nA---|This is the second edge|B;'); var vert = flow.parser.yy.getVertices(); @@ -435,76 +542,79 @@ describe('when parsing ',function(){ expect(edges[0].text).toBe(',.?!+-*'); }); + describe("it should handle text in vertices, ",function(){ - it('should handle text in vertices with space',function(){ - var res = flow.parser.parse('graph TD;A-->C(Chimpansen hoppar);'); + it('it should handle space',function(){ + var res = flow.parser.parse('graph TD;A-->C(Chimpansen hoppar);'); - var vert = flow.parser.yy.getVertices(); - var edges = flow.parser.yy.getEdges(); + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); - expect(vert['C'].type).toBe('round'); - expect(vert['C'].text).toBe('Chimpansen hoppar'); - }); + expect(vert['C'].type).toBe('round'); + expect(vert['C'].text).toBe('Chimpansen hoppar'); + }); + it('it should handle åäö and minus',function(){ + var res = flow.parser.parse('graph TD;A-->C{Chimpansen hoppar åäö-ÅÄÖ};'); - it('should handle text in vertices with åäö and minus',function(){ - var res = flow.parser.parse('graph TD;A-->C{Chimpansen hoppar åäö-ÅÄÖ};'); + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); - var vert = flow.parser.yy.getVertices(); - var edges = flow.parser.yy.getEdges(); + expect(vert['C'].type).toBe('diamond'); + expect(vert['C'].text).toBe('Chimpansen hoppar åäö-ÅÄÖ'); + }); - expect(vert['C'].type).toBe('diamond'); - expect(vert['C'].text).toBe('Chimpansen hoppar åäö-ÅÄÖ'); - }); - it('should handle text in vertices with åäö, minus and space and br',function(){ - var res = flow.parser.parse('graph TD;A-->C(Chimpansen hoppar åäö
- ÅÄÖ);'); + it('it should handle with åäö, minus and space and br',function(){ + var res = flow.parser.parse('graph TD;A-->C(Chimpansen hoppar åäö
- ÅÄÖ);'); - var vert = flow.parser.yy.getVertices(); - var edges = flow.parser.yy.getEdges(); + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); - expect(vert['C'].type).toBe('round'); - expect(vert['C'].text).toBe('Chimpansen hoppar åäö
- ÅÄÖ'); - }); - xit('should handle text in vertices with åäö, minus and space and br',function(){ - var res = flow.parser.parse('graph TD; A[Object(foo,bar)]-->B(Thing);'); + expect(vert['C'].type).toBe('round'); + expect(vert['C'].text).toBe('Chimpansen hoppar åäö
- ÅÄÖ'); + }); + xit('it should handle åäö, minus and space and br',function(){ + var res = flow.parser.parse('graph TD; A[Object(foo,bar)]-->B(Thing);'); - var vert = flow.parser.yy.getVertices(); - var edges = flow.parser.yy.getEdges(); + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); - expect(vert['C'].type).toBe('round'); - expect(vert['C'].text).toBe(' A[Object(foo,bar)]-->B(Thing);'); - }); - it('should handle text in vertices with unicode chars',function(){ - var res = flow.parser.parse('graph TD;A-->C(Начало);'); + expect(vert['C'].type).toBe('round'); + expect(vert['C'].text).toBe(' A[Object(foo,bar)]-->B(Thing);'); + }); + it('it should handle unicode chars',function(){ + var res = flow.parser.parse('graph TD;A-->C(Начало);'); - var vert = flow.parser.yy.getVertices(); + var vert = flow.parser.yy.getVertices(); - expect(vert['C'].text).toBe('Начало'); - }); - it('should handle text in vertices with backslask',function(){ - var res = flow.parser.parse('graph TD;A-->C(c:\\windows);'); + expect(vert['C'].text).toBe('Начало'); + }); + it('it should handle backslask',function(){ + var res = flow.parser.parse('graph TD;A-->C(c:\\windows);'); - var vert = flow.parser.yy.getVertices(); + var vert = flow.parser.yy.getVertices(); - expect(vert['C'].text).toBe('c:\\windows'); - }); - it('should handle text in vertices with CAPS',function(){ - var res = flow.parser.parse('graph TD;A-->C(some CAPS);'); + expect(vert['C'].text).toBe('c:\\windows'); + }); + it('it should handle CAPS',function(){ + var res = flow.parser.parse('graph TD;A-->C(some CAPS);'); - var vert = flow.parser.yy.getVertices(); - var edges = flow.parser.yy.getEdges(); + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); - expect(vert['C'].type).toBe('round'); - expect(vert['C'].text).toBe('some CAPS'); - }); - it('should handle text in vertices with directions',function(){ - var res = flow.parser.parse('graph TD;A-->C(some URL);'); + expect(vert['C'].type).toBe('round'); + expect(vert['C'].text).toBe('some CAPS'); + }); + it('it should handle directions',function(){ + var res = flow.parser.parse('graph TD;A-->C(some URL);'); - var vert = flow.parser.yy.getVertices(); - var edges = flow.parser.yy.getEdges(); + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); - expect(vert['C'].type).toBe('round'); - expect(vert['C'].text).toBe('some URL'); + expect(vert['C'].type).toBe('round'); + expect(vert['C'].text).toBe('some URL'); + }); }); + it('should handle a single node',function(){ // Silly but syntactically correct var res = flow.parser.parse('graph TD;A;');