From 3ec7c6d18b8fc6d7b4abac51076b0654b76021eb Mon Sep 17 00:00:00 2001 From: knsv Date: Thu, 23 Jul 2015 15:33:26 +0200 Subject: [PATCH] Fix for being able to use the character v in node ids as described in issue #192 --- src/diagrams/flowchart/parser/flow.jison | 6 +- src/diagrams/flowchart/parser/flow.js | 85 +++++++++++----------- src/diagrams/flowchart/parser/flow.spec.js | 48 ++++++++++++ 3 files changed, 96 insertions(+), 43 deletions(-) diff --git a/src/diagrams/flowchart/parser/flow.jison b/src/diagrams/flowchart/parser/flow.jison index 1b52c992b..e606e2894 100644 --- a/src/diagrams/flowchart/parser/flow.jison +++ b/src/diagrams/flowchart/parser/flow.jison @@ -277,8 +277,10 @@ alphaNumStatement {$$=$1;} | alphaNumToken {$$=$1;} - | alphaNumToken MINUS alphaNumToken - {$$=$1+'-'+$3;} + | DOWN + {$$='v';} + | MINUS + {$$='-';} ; link: linkStatement arrowText diff --git a/src/diagrams/flowchart/parser/flow.js b/src/diagrams/flowchart/parser/flow.js index ec46a6579..33949bbd3 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,4],$V1=[1,3],$V2=[1,5],$V3=[1,8,9,10,11,13,30,69,70,71,72,73,79,83,85,86,88,89,91,92,93],$V4=[2,2],$V5=[1,12],$V6=[1,13],$V7=[1,14],$V8=[1,15],$V9=[1,31],$Va=[1,22],$Vb=[1,24],$Vc=[1,25],$Vd=[1,26],$Ve=[1,27],$Vf=[1,28],$Vg=[1,34],$Vh=[1,36],$Vi=[1,33],$Vj=[1,35],$Vk=[1,41],$Vl=[1,40],$Vm=[1,37],$Vn=[1,38],$Vo=[1,39],$Vp=[1,8,9,10,11,13,30,32,69,70,71,72,73,79,83,85,86,88,89,91,92,93],$Vq=[1,49],$Vr=[1,48],$Vs=[1,50],$Vt=[1,68],$Vu=[1,76],$Vv=[1,77],$Vw=[1,62],$Vx=[1,61],$Vy=[1,81],$Vz=[1,80],$VA=[1,78],$VB=[1,79],$VC=[1,69],$VD=[1,64],$VE=[1,63],$VF=[1,59],$VG=[1,71],$VH=[1,72],$VI=[1,73],$VJ=[1,74],$VK=[1,75],$VL=[1,66],$VM=[1,65],$VN=[8,9,11],$VO=[8,9,11,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62],$VP=[1,110],$VQ=[8,9,10,11,13,15,36,38,40,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,79,83,85,86,88,89,91,92,93],$VR=[8,9,10,11,12,13,15,16,17,18,30,32,36,37,38,39,40,41,44,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,69,70,71,72,73,76,79,81,83,85,86,88,89,91,92,93],$VS=[1,113],$VT=[1,114],$VU=[8,9,10,11,13,30,32,69,70,71,72,73,79,83,85,86,88,89,91,92,93],$VV=[8,9,10,11,12,13,15,16,17,18,30,32,37,39,41,44,48,49,50,51,52,54,55,56,57,58,59,60,61,62,63,69,70,71,72,73,76,79,81,83,85,86,88,89,91,92,93],$VW=[13,79,83,85,86,88,89,91,92,93],$VX=[13,47,63,79,83,85,86,88,89,91,92,93],$VY=[1,186],$VZ=[1,183],$V_=[1,190],$V$=[1,187],$V01=[1,184],$V11=[1,191],$V21=[1,181],$V31=[1,182],$V41=[1,185],$V51=[1,188],$V61=[1,189],$V71=[1,204],$V81=[8,9,11,83],$V91=[8,9,10,11,44,69,78,79,81,83,85,86,87,88,89]; +var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,4],$V1=[1,3],$V2=[1,5],$V3=[1,8,9,10,11,13,18,30,44,69,70,71,72,73,79,83,85,86,88,89,91,92,93],$V4=[2,2],$V5=[1,12],$V6=[1,13],$V7=[1,14],$V8=[1,15],$V9=[1,31],$Va=[1,33],$Vb=[1,22],$Vc=[1,34],$Vd=[1,24],$Ve=[1,25],$Vf=[1,26],$Vg=[1,27],$Vh=[1,28],$Vi=[1,36],$Vj=[1,38],$Vk=[1,35],$Vl=[1,37],$Vm=[1,43],$Vn=[1,42],$Vo=[1,39],$Vp=[1,40],$Vq=[1,41],$Vr=[1,8,9,10,11,13,18,30,32,44,69,70,71,72,73,79,83,85,86,88,89,91,92,93],$Vs=[1,51],$Vt=[1,50],$Vu=[1,52],$Vv=[1,70],$Vw=[1,78],$Vx=[1,79],$Vy=[1,64],$Vz=[1,63],$VA=[1,83],$VB=[1,82],$VC=[1,80],$VD=[1,81],$VE=[1,71],$VF=[1,66],$VG=[1,65],$VH=[1,61],$VI=[1,73],$VJ=[1,74],$VK=[1,75],$VL=[1,76],$VM=[1,77],$VN=[1,68],$VO=[1,67],$VP=[8,9,11],$VQ=[8,9,11,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62],$VR=[1,112],$VS=[8,9,10,11,13,15,18,36,38,40,44,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,79,83,85,86,88,89,91,92,93],$VT=[8,9,10,11,12,13,15,16,17,18,30,32,36,37,38,39,40,41,44,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,69,70,71,72,73,76,79,81,83,85,86,88,89,91,92,93],$VU=[1,114],$VV=[1,115],$VW=[8,9,10,11,13,18,30,32,44,69,70,71,72,73,79,83,85,86,88,89,91,92,93],$VX=[8,9,10,11,12,13,15,16,17,18,30,32,37,39,41,44,48,49,50,51,52,54,55,56,57,58,59,60,61,62,63,69,70,71,72,73,76,79,81,83,85,86,88,89,91,92,93],$VY=[13,18,44,79,83,85,86,88,89,91,92,93],$VZ=[13,18,44,47,63,79,83,85,86,88,89,91,92,93],$V_=[1,186],$V$=[1,183],$V01=[1,190],$V11=[1,187],$V21=[1,184],$V31=[1,191],$V41=[1,181],$V51=[1,182],$V61=[1,185],$V71=[1,188],$V81=[1,189],$V91=[1,204],$Va1=[8,9,11,83],$Vb1=[8,9,10,11,44,69,78,79,81,83,85,86,87,88,89]; var parser = {trace: function trace() { }, yy: {}, symbols_: {"error":2,"mermaidDoc":3,"graphConfig":4,"document":5,"line":6,"statement":7,"SEMI":8,"NEWLINE":9,"SPACE":10,"EOF":11,"GRAPH":12,"DIR":13,"FirstStmtSeperator":14,"TAGEND":15,"TAGSTART":16,"UP":17,"DOWN":18,"ending":19,"endToken":20,"spaceList":21,"spaceListNewline":22,"verticeStatement":23,"separator":24,"styleStatement":25,"linkStyleStatement":26,"classDefStatement":27,"classStatement":28,"clickStatement":29,"subgraph":30,"text":31,"end":32,"vertex":33,"link":34,"alphaNum":35,"SQS":36,"SQE":37,"PS":38,"PE":39,"DIAMOND_START":40,"DIAMOND_STOP":41,"alphaNumStatement":42,"alphaNumToken":43,"MINUS":44,"linkStatement":45,"arrowText":46,"TESTSTR":47,"--":48,"ARROW_POINT":49,"ARROW_CIRCLE":50,"ARROW_CROSS":51,"ARROW_OPEN":52,"-.":53,"DOTTED_ARROW_POINT":54,"DOTTED_ARROW_CIRCLE":55,"DOTTED_ARROW_CROSS":56,"DOTTED_ARROW_OPEN":57,"==":58,"THICK_ARROW_POINT":59,"THICK_ARROW_CIRCLE":60,"THICK_ARROW_CROSS":61,"THICK_ARROW_OPEN":62,"PIPE":63,"textToken":64,"STR":65,"commentText":66,"commentToken":67,"keywords":68,"STYLE":69,"LINKSTYLE":70,"CLASSDEF":71,"CLASS":72,"CLICK":73,"textNoTags":74,"textNoTagsToken":75,"DEFAULT":76,"stylesOpt":77,"HEX":78,"NUM":79,"commentStatement":80,"PCT":81,"style":82,"COMMA":83,"styleComponent":84,"ALPHA":85,"COLON":86,"UNIT":87,"BRKT":88,"DOT":89,"graphCodeTokens":90,"PLUS":91,"EQUALS":92,"MULT":93,"TAG_START":94,"TAG_END":95,"QUOTE":96,"$accept":0,"$end":1}, terminals_: {2:"error",8:"SEMI",9:"NEWLINE",10:"SPACE",11:"EOF",12:"GRAPH",13:"DIR",15:"TAGEND",16:"TAGSTART",17:"UP",18:"DOWN",30:"subgraph",32:"end",36:"SQS",37:"SQE",38:"PS",39:"PE",40:"DIAMOND_START",41:"DIAMOND_STOP",44:"MINUS",47:"TESTSTR",48:"--",49:"ARROW_POINT",50:"ARROW_CIRCLE",51:"ARROW_CROSS",52:"ARROW_OPEN",53:"-.",54:"DOTTED_ARROW_POINT",55:"DOTTED_ARROW_CIRCLE",56:"DOTTED_ARROW_CROSS",57:"DOTTED_ARROW_OPEN",58:"==",59:"THICK_ARROW_POINT",60:"THICK_ARROW_CIRCLE",61:"THICK_ARROW_CROSS",62:"THICK_ARROW_OPEN",63:"PIPE",65:"STR",69:"STYLE",70:"LINKSTYLE",71:"CLASSDEF",72:"CLASS",73:"CLICK",76:"DEFAULT",78:"HEX",79:"NUM",81:"PCT",83:"COMMA",85:"ALPHA",86:"COLON",87:"UNIT",88:"BRKT",89:"DOT",91:"PLUS",92:"EQUALS",93:"MULT",94:"TAG_START",95:"TAG_END",96:"QUOTE"}, -productions_: [0,[3,2],[5,0],[5,2],[6,1],[6,1],[6,1],[6,1],[6,1],[4,2],[4,2],[4,4],[4,4],[4,4],[4,4],[4,4],[19,2],[19,1],[20,1],[20,1],[20,1],[14,1],[14,1],[14,2],[22,2],[22,2],[22,1],[22,1],[21,2],[21,1],[7,2],[7,2],[7,2],[7,2],[7,2],[7,2],[7,5],[7,4],[24,1],[24,1],[24,1],[23,3],[23,1],[33,4],[33,5],[33,6],[33,7],[33,4],[33,5],[33,4],[33,5],[33,4],[33,5],[33,1],[33,2],[35,1],[35,2],[42,1],[42,1],[42,3],[34,2],[34,3],[34,3],[34,1],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[46,3],[31,1],[31,2],[31,1],[66,1],[66,2],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[74,1],[74,2],[27,5],[27,5],[28,5],[29,5],[25,5],[25,5],[26,5],[26,5],[80,3],[77,1],[77,3],[82,1],[82,2],[84,1],[84,1],[84,1],[84,1],[84,1],[84,1],[84,1],[84,1],[84,1],[84,1],[84,1],[67,1],[67,1],[64,1],[64,1],[64,1],[64,1],[64,1],[64,1],[64,1],[75,1],[75,1],[75,1],[75,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1]], +productions_: [0,[3,2],[5,0],[5,2],[6,1],[6,1],[6,1],[6,1],[6,1],[4,2],[4,2],[4,4],[4,4],[4,4],[4,4],[4,4],[19,2],[19,1],[20,1],[20,1],[20,1],[14,1],[14,1],[14,2],[22,2],[22,2],[22,1],[22,1],[21,2],[21,1],[7,2],[7,2],[7,2],[7,2],[7,2],[7,2],[7,5],[7,4],[24,1],[24,1],[24,1],[23,3],[23,1],[33,4],[33,5],[33,6],[33,7],[33,4],[33,5],[33,4],[33,5],[33,4],[33,5],[33,1],[33,2],[35,1],[35,2],[42,1],[42,1],[42,1],[42,1],[34,2],[34,3],[34,3],[34,1],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[34,3],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[45,1],[46,3],[31,1],[31,2],[31,1],[66,1],[66,2],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[68,1],[74,1],[74,2],[27,5],[27,5],[28,5],[29,5],[25,5],[25,5],[26,5],[26,5],[80,3],[77,1],[77,3],[82,1],[82,2],[84,1],[84,1],[84,1],[84,1],[84,1],[84,1],[84,1],[84,1],[84,1],[84,1],[84,1],[67,1],[67,1],[64,1],[64,1],[64,1],[64,1],[64,1],[64,1],[64,1],[75,1],[75,1],[75,1],[75,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[43,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1],[90,1]], performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) { /* this == yyval */ @@ -93,7 +93,7 @@ case 3: } this.$=$$[$0-1]; break; -case 4: case 55: case 57: case 58: case 89: case 91: case 92: case 105: +case 4: case 55: case 57: case 58: case 90: case 92: case 93: case 106: this.$=$$[$0]; break; case 11: @@ -165,123 +165,126 @@ break; case 54: this.$ = $$[$0-1];yy.addVertex($$[$0-1]); break; -case 56: case 90: case 93: case 106: +case 56: case 91: case 94: case 107: this.$=$$[$0-1]+''+$$[$0]; break; case 59: -this.$=$$[$0-2]+'-'+$$[$0]; +this.$='v'; break; case 60: +this.$='-'; +break; +case 61: $$[$0-1].text = $$[$0];this.$ = $$[$0-1]; break; -case 61: case 62: +case 62: case 63: $$[$0-2].text = $$[$0-1];this.$ = $$[$0-2]; break; -case 63: +case 64: this.$ = $$[$0]; break; -case 64: +case 65: this.$ = {"type":"arrow","stroke":"normal","text":$$[$0-1]}; break; -case 65: +case 66: this.$ = {"type":"arrow_circle","stroke":"normal","text":$$[$0-1]}; break; -case 66: +case 67: this.$ = {"type":"arrow_cross","stroke":"normal","text":$$[$0-1]}; break; -case 67: +case 68: this.$ = {"type":"arrow_open","stroke":"normal","text":$$[$0-1]}; break; -case 68: +case 69: this.$ = {"type":"arrow","stroke":"dotted","text":$$[$0-1]}; break; -case 69: +case 70: this.$ = {"type":"arrow_circle","stroke":"dotted","text":$$[$0-1]}; break; -case 70: +case 71: this.$ = {"type":"arrow_cross","stroke":"dotted","text":$$[$0-1]}; break; -case 71: +case 72: this.$ = {"type":"arrow_open","stroke":"dotted","text":$$[$0-1]}; break; -case 72: +case 73: this.$ = {"type":"arrow","stroke":"thick","text":$$[$0-1]}; break; -case 73: +case 74: this.$ = {"type":"arrow_circle","stroke":"thick","text":$$[$0-1]}; break; -case 74: +case 75: this.$ = {"type":"arrow_cross","stroke":"thick","text":$$[$0-1]}; break; -case 75: +case 76: this.$ = {"type":"arrow_open","stroke":"thick","text":$$[$0-1]}; break; -case 76: +case 77: this.$ = {"type":"arrow","stroke":"normal"}; break; -case 77: +case 78: this.$ = {"type":"arrow_circle","stroke":"normal"}; break; -case 78: +case 79: this.$ = {"type":"arrow_cross","stroke":"normal"}; break; -case 79: +case 80: this.$ = {"type":"arrow_open","stroke":"normal"}; break; -case 80: +case 81: this.$ = {"type":"arrow","stroke":"dotted"}; break; -case 81: +case 82: this.$ = {"type":"arrow_circle","stroke":"dotted"}; break; -case 82: +case 83: this.$ = {"type":"arrow_cross","stroke":"dotted"}; break; -case 83: +case 84: this.$ = {"type":"arrow_open","stroke":"dotted"}; break; -case 84: +case 85: this.$ = {"type":"arrow","stroke":"thick"}; break; -case 85: +case 86: this.$ = {"type":"arrow_circle","stroke":"thick"}; break; -case 86: +case 87: this.$ = {"type":"arrow_cross","stroke":"thick"}; break; -case 87: +case 88: this.$ = {"type":"arrow_open","stroke":"thick"}; break; -case 88: +case 89: this.$ = $$[$0-1]; break; -case 107: case 108: +case 108: case 109: this.$ = $$[$0-4];yy.addClass($$[$0-2],$$[$0]); break; -case 109: +case 110: this.$ = $$[$0-4];yy.setClass($$[$0-2], $$[$0]); break; -case 110: +case 111: this.$ = $$[$0-4];yy.setClickEvent($$[$0-2], $$[$0]); break; -case 111: +case 112: this.$ = $$[$0-4];yy.addVertex($$[$0-2],undefined,undefined,$$[$0]); break; -case 112: case 113: case 114: +case 113: case 114: case 115: this.$ = $$[$0-4];yy.updateLink($$[$0-2],$$[$0]); break; -case 116: +case 117: this.$ = [$$[$0]] break; -case 117: +case 118: $$[$0-2].push($$[$0]);this.$ = $$[$0-2]; break; -case 119: +case 120: this.$ = $$[$0-1] + $$[$0]; break; } }, -table: [{3:1,4:2,9:$V0,10:$V1,12:$V2},{1:[3]},o($V3,$V4,{5:6}),{4:7,9:$V0,10:$V1,12:$V2},{4:8,9:$V0,10:$V1,12:$V2},{10:[1,9]},{1:[2,1],6:10,7:11,8:$V5,9:$V6,10:$V7,11:$V8,13:$V9,23:16,25:17,26:18,27:19,28:20,29:21,30:$Va,33:23,35:29,42:30,43:32,69:$Vb,70:$Vc,71:$Vd,72:$Ve,73:$Vf,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},o($V3,[2,9]),o($V3,[2,10]),{13:[1,42],15:[1,43],16:[1,44],17:[1,45],18:[1,46]},o($Vp,[2,3]),o($Vp,[2,4]),o($Vp,[2,5]),o($Vp,[2,6]),o($Vp,[2,7]),o($Vp,[2,8]),{8:$Vq,9:$Vr,11:$Vs,24:47},{8:$Vq,9:$Vr,11:$Vs,24:51},{8:$Vq,9:$Vr,11:$Vs,24:52},{8:$Vq,9:$Vr,11:$Vs,24:53},{8:$Vq,9:$Vr,11:$Vs,24:54},{8:$Vq,9:$Vr,11:$Vs,24:55},{8:$Vq,9:$Vr,10:$Vt,11:$Vs,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,24:57,30:$VA,31:56,32:$VB,43:67,44:$VC,48:$VD,58:$VE,64:58,65:$VF,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},o($VN,[2,42],{34:82,45:83,48:[1,84],49:[1,87],50:[1,88],51:[1,89],52:[1,90],53:[1,85],54:[1,91],55:[1,92],56:[1,93],57:[1,94],58:[1,86],59:[1,95],60:[1,96],61:[1,97],62:[1,98]}),{10:[1,99]},{10:[1,100]},{10:[1,101]},{10:[1,102]},{10:[1,103]},o($VO,[2,53],{43:32,21:108,42:109,10:$VP,13:$V9,15:[1,107],36:[1,104],38:[1,105],40:[1,106],79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo}),o($VQ,[2,55]),o($VQ,[2,57]),o($VQ,[2,58],{44:[1,111]}),o($VR,[2,144]),o($VR,[2,145]),o($VR,[2,146]),o($VR,[2,147]),o($VR,[2,148]),o($VR,[2,149]),o($VR,[2,150]),o($VR,[2,151]),o($VR,[2,152]),{8:$VS,9:$VT,10:$VP,14:112,21:115},{8:$VS,9:$VT,10:$VP,14:116,21:115},{8:$VS,9:$VT,10:$VP,14:117,21:115},{8:$VS,9:$VT,10:$VP,14:118,21:115},{8:$VS,9:$VT,10:$VP,14:119,21:115},o($Vp,[2,30]),o($Vp,[2,38]),o($Vp,[2,39]),o($Vp,[2,40]),o($Vp,[2,31]),o($Vp,[2,32]),o($Vp,[2,33]),o($Vp,[2,34]),o($Vp,[2,35]),{8:$Vq,9:$Vr,10:$Vt,11:$Vs,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,24:120,30:$VA,32:$VB,43:67,44:$VC,48:$VD,58:$VE,64:121,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},o($VU,$V4,{5:122}),o($VV,[2,89]),o($VV,[2,91]),o($VV,[2,133]),o($VV,[2,134]),o($VV,[2,135]),o($VV,[2,136]),o($VV,[2,137]),o($VV,[2,138]),o($VV,[2,139]),o($VV,[2,140]),o($VV,[2,141]),o($VV,[2,142]),o($VV,[2,143]),o($VV,[2,94]),o($VV,[2,95]),o($VV,[2,96]),o($VV,[2,97]),o($VV,[2,98]),o($VV,[2,99]),o($VV,[2,100]),o($VV,[2,101]),o($VV,[2,102]),o($VV,[2,103]),o($VV,[2,104]),{13:$V9,33:123,35:29,42:30,43:32,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},o($VW,[2,63],{46:124,47:[1,125],63:[1,126]}),{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,31:127,32:$VB,43:67,44:$VC,48:$VD,58:$VE,64:58,65:$VF,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,31:128,32:$VB,43:67,44:$VC,48:$VD,58:$VE,64:58,65:$VF,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,31:129,32:$VB,43:67,44:$VC,48:$VD,58:$VE,64:58,65:$VF,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},o($VX,[2,76]),o($VX,[2,77]),o($VX,[2,78]),o($VX,[2,79]),o($VX,[2,80]),o($VX,[2,81]),o($VX,[2,82]),o($VX,[2,83]),o($VX,[2,84]),o($VX,[2,85]),o($VX,[2,86]),o($VX,[2,87]),{13:$V9,35:130,42:30,43:32,78:[1,131],79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{76:[1,132],79:[1,133]},{13:$V9,35:135,42:30,43:32,76:[1,134],79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{13:$V9,35:136,42:30,43:32,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{13:$V9,35:137,42:30,43:32,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,31:138,32:$VB,43:67,44:$VC,48:$VD,58:$VE,64:58,65:$VF,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,31:140,32:$VB,38:[1,139],43:67,44:$VC,48:$VD,58:$VE,64:58,65:$VF,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,31:141,32:$VB,43:67,44:$VC,48:$VD,58:$VE,64:58,65:$VF,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,31:142,32:$VB,43:67,44:$VC,48:$VD,58:$VE,64:58,65:$VF,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},o($VO,[2,54]),o($VQ,[2,56]),o($VO,[2,29],{21:143,10:$VP}),{43:144,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},o($V3,[2,11]),o($V3,[2,21]),o($V3,[2,22]),{9:[1,145]},o($V3,[2,12]),o($V3,[2,13]),o($V3,[2,14]),o($V3,[2,15]),o($VU,$V4,{5:146}),o($VV,[2,90]),{6:10,7:11,8:$V5,9:$V6,10:$V7,11:$V8,13:$V9,23:16,25:17,26:18,27:19,28:20,29:21,30:$Va,32:[1,147],33:23,35:29,42:30,43:32,69:$Vb,70:$Vc,71:$Vd,72:$Ve,73:$Vf,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},o($VN,[2,41]),o($VW,[2,60],{10:[1,148]}),{10:[1,149]},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,31:150,32:$VB,43:67,44:$VC,48:$VD,58:$VE,64:58,65:$VF,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,32:$VB,43:67,44:$VC,48:$VD,49:[1,151],50:[1,152],51:[1,153],52:[1,154],58:$VE,64:121,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,32:$VB,43:67,44:$VC,48:$VD,54:[1,155],55:[1,156],56:[1,157],57:[1,158],58:$VE,64:121,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,32:$VB,43:67,44:$VC,48:$VD,58:$VE,59:[1,159],60:[1,160],61:[1,161],62:[1,162],64:121,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:[1,163],13:$V9,42:109,43:32,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:[1,164]},{10:[1,165]},{10:[1,166]},{10:[1,167]},{10:[1,168],13:$V9,42:109,43:32,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:[1,169],13:$V9,42:109,43:32,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:[1,170],13:$V9,42:109,43:32,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,32:$VB,37:[1,171],43:67,44:$VC,48:$VD,58:$VE,64:121,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,31:172,32:$VB,43:67,44:$VC,48:$VD,58:$VE,64:58,65:$VF,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,32:$VB,39:[1,173],43:67,44:$VC,48:$VD,58:$VE,64:121,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,32:$VB,41:[1,174],43:67,44:$VC,48:$VD,58:$VE,64:121,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,32:$VB,37:[1,175],43:67,44:$VC,48:$VD,58:$VE,64:121,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},o($VO,[2,28]),o($VQ,[2,59]),o($V3,[2,23]),{6:10,7:11,8:$V5,9:$V6,10:$V7,11:$V8,13:$V9,23:16,25:17,26:18,27:19,28:20,29:21,30:$Va,32:[1,176],33:23,35:29,42:30,43:32,69:$Vb,70:$Vc,71:$Vd,72:$Ve,73:$Vf,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},o($Vp,[2,37]),o($VW,[2,62]),o($VW,[2,61]),{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,32:$VB,43:67,44:$VC,48:$VD,58:$VE,63:[1,177],64:121,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},o($VW,[2,64]),o($VW,[2,65]),o($VW,[2,66]),o($VW,[2,67]),o($VW,[2,68]),o($VW,[2,69]),o($VW,[2,70]),o($VW,[2,71]),o($VW,[2,72]),o($VW,[2,73]),o($VW,[2,74]),o($VW,[2,75]),{10:$VY,44:$VZ,69:$V_,77:178,78:$V$,79:$V01,81:$V11,82:179,84:180,85:$V21,86:$V31,87:$V41,88:$V51,89:$V61},{10:$VY,44:$VZ,69:$V_,77:192,78:$V$,79:$V01,81:$V11,82:179,84:180,85:$V21,86:$V31,87:$V41,88:$V51,89:$V61},{10:$VY,44:$VZ,69:$V_,77:193,78:$V$,79:$V01,81:$V11,82:179,84:180,85:$V21,86:$V31,87:$V41,88:$V51,89:$V61},{10:$VY,44:$VZ,69:$V_,77:194,78:$V$,79:$V01,81:$V11,82:179,84:180,85:$V21,86:$V31,87:$V41,88:$V51,89:$V61},{10:$VY,44:$VZ,69:$V_,77:195,78:$V$,79:$V01,81:$V11,82:179,84:180,85:$V21,86:$V31,87:$V41,88:$V51,89:$V61},{10:$VY,44:$VZ,69:$V_,77:196,78:$V$,79:$V01,81:$V11,82:179,84:180,85:$V21,86:$V31,87:$V41,88:$V51,89:$V61},{13:$V9,35:197,42:30,43:32,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},{13:$V9,35:198,42:30,43:32,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},o($VO,[2,43],{21:199,10:$VP}),{10:$Vt,12:$Vu,13:$Vv,15:$Vw,16:$Vx,17:$Vy,18:$Vz,30:$VA,32:$VB,39:[1,200],43:67,44:$VC,48:$VD,58:$VE,64:121,68:70,69:$VG,70:$VH,71:$VI,72:$VJ,73:$VK,75:60,76:$VL,79:$Vg,81:$VM,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo},o($VO,[2,47],{21:201,10:$VP}),o($VO,[2,49],{21:202,10:$VP}),o($VO,[2,51],{21:203,10:$VP}),o($Vp,[2,36]),o([10,13,79,83,85,86,88,89,91,92,93],[2,88]),o($VN,[2,111],{83:$V71}),o($V81,[2,116],{84:205,10:$VY,44:$VZ,69:$V_,78:$V$,79:$V01,81:$V11,85:$V21,86:$V31,87:$V41,88:$V51,89:$V61}),o($V91,[2,118]),o($V91,[2,120]),o($V91,[2,121]),o($V91,[2,122]),o($V91,[2,123]),o($V91,[2,124]),o($V91,[2,125]),o($V91,[2,126]),o($V91,[2,127]),o($V91,[2,128]),o($V91,[2,129]),o($V91,[2,130]),o($VN,[2,112],{83:$V71}),o($VN,[2,113],{83:$V71}),o($VN,[2,114],{83:$V71}),o($VN,[2,107],{83:$V71}),o($VN,[2,108],{83:$V71}),o($VN,[2,109],{43:32,42:109,13:$V9,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo}),o($VN,[2,110],{43:32,42:109,13:$V9,79:$Vg,83:$Vh,85:$Vi,86:$Vj,88:$Vk,89:$Vl,91:$Vm,92:$Vn,93:$Vo}),o($VO,[2,44]),{39:[1,206]},o($VO,[2,48]),o($VO,[2,50]),o($VO,[2,52]),{10:$VY,44:$VZ,69:$V_,78:$V$,79:$V01,81:$V11,82:207,84:180,85:$V21,86:$V31,87:$V41,88:$V51,89:$V61},o($V91,[2,119]),o($VO,[2,45],{21:208,10:$VP}),o($V81,[2,117],{84:205,10:$VY,44:$VZ,69:$V_,78:$V$,79:$V01,81:$V11,85:$V21,86:$V31,87:$V41,88:$V51,89:$V61}),o($VO,[2,46])], +table: [{3:1,4:2,9:$V0,10:$V1,12:$V2},{1:[3]},o($V3,$V4,{5:6}),{4:7,9:$V0,10:$V1,12:$V2},{4:8,9:$V0,10:$V1,12:$V2},{10:[1,9]},{1:[2,1],6:10,7:11,8:$V5,9:$V6,10:$V7,11:$V8,13:$V9,18:$Va,23:16,25:17,26:18,27:19,28:20,29:21,30:$Vb,33:23,35:29,42:30,43:32,44:$Vc,69:$Vd,70:$Ve,71:$Vf,72:$Vg,73:$Vh,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},o($V3,[2,9]),o($V3,[2,10]),{13:[1,44],15:[1,45],16:[1,46],17:[1,47],18:[1,48]},o($Vr,[2,3]),o($Vr,[2,4]),o($Vr,[2,5]),o($Vr,[2,6]),o($Vr,[2,7]),o($Vr,[2,8]),{8:$Vs,9:$Vt,11:$Vu,24:49},{8:$Vs,9:$Vt,11:$Vu,24:53},{8:$Vs,9:$Vt,11:$Vu,24:54},{8:$Vs,9:$Vt,11:$Vu,24:55},{8:$Vs,9:$Vt,11:$Vu,24:56},{8:$Vs,9:$Vt,11:$Vu,24:57},{8:$Vs,9:$Vt,10:$Vv,11:$Vu,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,24:59,30:$VC,31:58,32:$VD,43:69,44:$VE,48:$VF,58:$VG,64:60,65:$VH,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},o($VP,[2,42],{34:84,45:85,48:[1,86],49:[1,89],50:[1,90],51:[1,91],52:[1,92],53:[1,87],54:[1,93],55:[1,94],56:[1,95],57:[1,96],58:[1,88],59:[1,97],60:[1,98],61:[1,99],62:[1,100]}),{10:[1,101]},{10:[1,102]},{10:[1,103]},{10:[1,104]},{10:[1,105]},o($VQ,[2,53],{43:32,21:110,42:111,10:$VR,13:$V9,15:[1,109],18:$Va,36:[1,106],38:[1,107],40:[1,108],44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq}),o($VS,[2,55]),o($VS,[2,57]),o($VS,[2,58]),o($VS,[2,59]),o($VS,[2,60]),o($VT,[2,145]),o($VT,[2,146]),o($VT,[2,147]),o($VT,[2,148]),o($VT,[2,149]),o($VT,[2,150]),o($VT,[2,151]),o($VT,[2,152]),o($VT,[2,153]),{8:$VU,9:$VV,10:$VR,14:113,21:116},{8:$VU,9:$VV,10:$VR,14:117,21:116},{8:$VU,9:$VV,10:$VR,14:118,21:116},{8:$VU,9:$VV,10:$VR,14:119,21:116},{8:$VU,9:$VV,10:$VR,14:120,21:116},o($Vr,[2,30]),o($Vr,[2,38]),o($Vr,[2,39]),o($Vr,[2,40]),o($Vr,[2,31]),o($Vr,[2,32]),o($Vr,[2,33]),o($Vr,[2,34]),o($Vr,[2,35]),{8:$Vs,9:$Vt,10:$Vv,11:$Vu,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,24:121,30:$VC,32:$VD,43:69,44:$VE,48:$VF,58:$VG,64:122,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},o($VW,$V4,{5:123}),o($VX,[2,90]),o($VX,[2,92]),o($VX,[2,134]),o($VX,[2,135]),o($VX,[2,136]),o($VX,[2,137]),o($VX,[2,138]),o($VX,[2,139]),o($VX,[2,140]),o($VX,[2,141]),o($VX,[2,142]),o($VX,[2,143]),o($VX,[2,144]),o($VX,[2,95]),o($VX,[2,96]),o($VX,[2,97]),o($VX,[2,98]),o($VX,[2,99]),o($VX,[2,100]),o($VX,[2,101]),o($VX,[2,102]),o($VX,[2,103]),o($VX,[2,104]),o($VX,[2,105]),{13:$V9,18:$Va,33:124,35:29,42:30,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},o($VY,[2,64],{46:125,47:[1,126],63:[1,127]}),{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,31:128,32:$VD,43:69,44:$VE,48:$VF,58:$VG,64:60,65:$VH,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,31:129,32:$VD,43:69,44:$VE,48:$VF,58:$VG,64:60,65:$VH,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,31:130,32:$VD,43:69,44:$VE,48:$VF,58:$VG,64:60,65:$VH,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},o($VZ,[2,77]),o($VZ,[2,78]),o($VZ,[2,79]),o($VZ,[2,80]),o($VZ,[2,81]),o($VZ,[2,82]),o($VZ,[2,83]),o($VZ,[2,84]),o($VZ,[2,85]),o($VZ,[2,86]),o($VZ,[2,87]),o($VZ,[2,88]),{13:$V9,18:$Va,35:131,42:30,43:32,44:$Vc,78:[1,132],79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{76:[1,133],79:[1,134]},{13:$V9,18:$Va,35:136,42:30,43:32,44:$Vc,76:[1,135],79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{13:$V9,18:$Va,35:137,42:30,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{13:$V9,18:$Va,35:138,42:30,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,31:139,32:$VD,43:69,44:$VE,48:$VF,58:$VG,64:60,65:$VH,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,31:141,32:$VD,38:[1,140],43:69,44:$VE,48:$VF,58:$VG,64:60,65:$VH,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,31:142,32:$VD,43:69,44:$VE,48:$VF,58:$VG,64:60,65:$VH,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,31:143,32:$VD,43:69,44:$VE,48:$VF,58:$VG,64:60,65:$VH,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},o($VQ,[2,54]),o($VS,[2,56]),o($VQ,[2,29],{21:144,10:$VR}),o($V3,[2,11]),o($V3,[2,21]),o($V3,[2,22]),{9:[1,145]},o($V3,[2,12]),o($V3,[2,13]),o($V3,[2,14]),o($V3,[2,15]),o($VW,$V4,{5:146}),o($VX,[2,91]),{6:10,7:11,8:$V5,9:$V6,10:$V7,11:$V8,13:$V9,18:$Va,23:16,25:17,26:18,27:19,28:20,29:21,30:$Vb,32:[1,147],33:23,35:29,42:30,43:32,44:$Vc,69:$Vd,70:$Ve,71:$Vf,72:$Vg,73:$Vh,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},o($VP,[2,41]),o($VY,[2,61],{10:[1,148]}),{10:[1,149]},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,31:150,32:$VD,43:69,44:$VE,48:$VF,58:$VG,64:60,65:$VH,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,32:$VD,43:69,44:$VE,48:$VF,49:[1,151],50:[1,152],51:[1,153],52:[1,154],58:$VG,64:122,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,32:$VD,43:69,44:$VE,48:$VF,54:[1,155],55:[1,156],56:[1,157],57:[1,158],58:$VG,64:122,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,32:$VD,43:69,44:$VE,48:$VF,58:$VG,59:[1,159],60:[1,160],61:[1,161],62:[1,162],64:122,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:[1,163],13:$V9,18:$Va,42:111,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:[1,164]},{10:[1,165]},{10:[1,166]},{10:[1,167]},{10:[1,168],13:$V9,18:$Va,42:111,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:[1,169],13:$V9,18:$Va,42:111,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:[1,170],13:$V9,18:$Va,42:111,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,32:$VD,37:[1,171],43:69,44:$VE,48:$VF,58:$VG,64:122,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,31:172,32:$VD,43:69,44:$VE,48:$VF,58:$VG,64:60,65:$VH,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,32:$VD,39:[1,173],43:69,44:$VE,48:$VF,58:$VG,64:122,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,32:$VD,41:[1,174],43:69,44:$VE,48:$VF,58:$VG,64:122,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,32:$VD,37:[1,175],43:69,44:$VE,48:$VF,58:$VG,64:122,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},o($VQ,[2,28]),o($V3,[2,23]),{6:10,7:11,8:$V5,9:$V6,10:$V7,11:$V8,13:$V9,18:$Va,23:16,25:17,26:18,27:19,28:20,29:21,30:$Vb,32:[1,176],33:23,35:29,42:30,43:32,44:$Vc,69:$Vd,70:$Ve,71:$Vf,72:$Vg,73:$Vh,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},o($Vr,[2,37]),o($VY,[2,63]),o($VY,[2,62]),{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,32:$VD,43:69,44:$VE,48:$VF,58:$VG,63:[1,177],64:122,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},o($VY,[2,65]),o($VY,[2,66]),o($VY,[2,67]),o($VY,[2,68]),o($VY,[2,69]),o($VY,[2,70]),o($VY,[2,71]),o($VY,[2,72]),o($VY,[2,73]),o($VY,[2,74]),o($VY,[2,75]),o($VY,[2,76]),{10:$V_,44:$V$,69:$V01,77:178,78:$V11,79:$V21,81:$V31,82:179,84:180,85:$V41,86:$V51,87:$V61,88:$V71,89:$V81},{10:$V_,44:$V$,69:$V01,77:192,78:$V11,79:$V21,81:$V31,82:179,84:180,85:$V41,86:$V51,87:$V61,88:$V71,89:$V81},{10:$V_,44:$V$,69:$V01,77:193,78:$V11,79:$V21,81:$V31,82:179,84:180,85:$V41,86:$V51,87:$V61,88:$V71,89:$V81},{10:$V_,44:$V$,69:$V01,77:194,78:$V11,79:$V21,81:$V31,82:179,84:180,85:$V41,86:$V51,87:$V61,88:$V71,89:$V81},{10:$V_,44:$V$,69:$V01,77:195,78:$V11,79:$V21,81:$V31,82:179,84:180,85:$V41,86:$V51,87:$V61,88:$V71,89:$V81},{10:$V_,44:$V$,69:$V01,77:196,78:$V11,79:$V21,81:$V31,82:179,84:180,85:$V41,86:$V51,87:$V61,88:$V71,89:$V81},{13:$V9,18:$Va,35:197,42:30,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},{13:$V9,18:$Va,35:198,42:30,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},o($VQ,[2,43],{21:199,10:$VR}),{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,32:$VD,39:[1,200],43:69,44:$VE,48:$VF,58:$VG,64:122,68:72,69:$VI,70:$VJ,71:$VK,72:$VL,73:$VM,75:62,76:$VN,79:$Vi,81:$VO,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},o($VQ,[2,47],{21:201,10:$VR}),o($VQ,[2,49],{21:202,10:$VR}),o($VQ,[2,51],{21:203,10:$VR}),o($Vr,[2,36]),o([10,13,18,44,79,83,85,86,88,89,91,92,93],[2,89]),o($VP,[2,112],{83:$V91}),o($Va1,[2,117],{84:205,10:$V_,44:$V$,69:$V01,78:$V11,79:$V21,81:$V31,85:$V41,86:$V51,87:$V61,88:$V71,89:$V81}),o($Vb1,[2,119]),o($Vb1,[2,121]),o($Vb1,[2,122]),o($Vb1,[2,123]),o($Vb1,[2,124]),o($Vb1,[2,125]),o($Vb1,[2,126]),o($Vb1,[2,127]),o($Vb1,[2,128]),o($Vb1,[2,129]),o($Vb1,[2,130]),o($Vb1,[2,131]),o($VP,[2,113],{83:$V91}),o($VP,[2,114],{83:$V91}),o($VP,[2,115],{83:$V91}),o($VP,[2,108],{83:$V91}),o($VP,[2,109],{83:$V91}),o($VP,[2,110],{43:32,42:111,13:$V9,18:$Va,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq}),o($VP,[2,111],{43:32,42:111,13:$V9,18:$Va,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq}),o($VQ,[2,44]),{39:[1,206]},o($VQ,[2,48]),o($VQ,[2,50]),o($VQ,[2,52]),{10:$V_,44:$V$,69:$V01,78:$V11,79:$V21,81:$V31,82:207,84:180,85:$V41,86:$V51,87:$V61,88:$V71,89:$V81},o($Vb1,[2,120]),o($VQ,[2,45],{21:208,10:$VR}),o($Va1,[2,118],{84:205,10:$V_,44:$V$,69:$V01,78:$V11,79:$V21,81:$V31,85:$V41,86:$V51,87:$V61,88:$V71,89:$V81}),o($VQ,[2,46])], defaultActions: {}, parseError: function parseError(str, hash) { if (hash.recoverable) { diff --git a/src/diagrams/flowchart/parser/flow.spec.js b/src/diagrams/flowchart/parser/flow.spec.js index 2b9234ec3..de42ae790 100644 --- a/src/diagrams/flowchart/parser/flow.spec.js +++ b/src/diagrams/flowchart/parser/flow.spec.js @@ -538,6 +538,54 @@ describe('when parsing ',function(){ expect(edges[0].type).toBe('arrow_cross'); expect(edges[0].text).toBe('text including `'); + }); + it('should handle v in node ids only v',function(){ + // only v + var res = flow.parser.parse('graph TD;A--xv(my text);'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + + expect(edges[0].type).toBe('arrow_cross'); + expect(vert['v'].text).toBe('my text'); + + }); + it('should handle v in node ids v at end',function(){ + // v at end + var res = flow.parser.parse('graph TD;A--xcsv(my text);'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + + expect(edges[0].type).toBe('arrow_cross'); + expect(vert['csv'].text).toBe('my text'); + + }); + it('should handle v in node ids v in middle',function(){ + // v in middle + var res = flow.parser.parse('graph TD;A--xava(my text);'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + + expect(edges[0].type).toBe('arrow_cross'); + expect(vert['ava'].text).toBe('my text'); + + }); + it('should handle v in node ids, v at start',function(){ + // v at start + var res = flow.parser.parse('graph TD;A--xva(my text);'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + + expect(edges[0].type).toBe('arrow_cross'); + expect(vert['va'].text).toBe('my text'); + }); it('should handle keywords',function(){ var res = flow.parser.parse('graph TD;A--x|text including graph space|B;');