diff --git a/src/diagrams/example/parser/example.js b/src/diagrams/example/parser/example.js index b25ee6648f..29960ee0cb 100644 --- a/src/diagrams/example/parser/example.js +++ b/src/diagrams/example/parser/example.js @@ -71,7 +71,7 @@ recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error) } */ -var parser = (function(){ +var example = (function(){ var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[6,9,10,12]; var parser = {trace: function trace() { }, yy: {}, @@ -106,7 +106,13 @@ parseError: function parseError(str, hash) { if (hash.recoverable) { this.trace(str); } else { - throw new Error(str); + function _parseError (msg, hash) { + this.message = msg; + this.hash = hash; + } + _parseError.prototype = new Error(); + + throw new _parseError(str, hash); } }, parse: function parse(input) { @@ -607,9 +613,9 @@ return new Parser; if (typeof require !== 'undefined' && typeof exports !== 'undefined') { -exports.parser = parser; -exports.Parser = parser.Parser; -exports.parse = function () { return parser.parse.apply(parser, arguments); }; +exports.parser = example; +exports.Parser = example.Parser; +exports.parse = function () { return example.parse.apply(example, arguments); }; exports.main = function commonjsMain(args) { if (!args[1]) { console.log('Usage: '+args[0]+' FILE'); diff --git a/src/diagrams/flowchart/parser/dot.js b/src/diagrams/flowchart/parser/dot.js index f4542fa217..f447c4538b 100644 --- a/src/diagrams/flowchart/parser/dot.js +++ b/src/diagrams/flowchart/parser/dot.js @@ -71,7 +71,7 @@ recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error) } */ -var parser = (function(){ +var dot = (function(){ var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,5],$V1=[1,6],$V2=[1,12],$V3=[1,13],$V4=[1,14],$V5=[1,15],$V6=[1,16],$V7=[1,17],$V8=[1,18],$V9=[1,19],$Va=[1,20],$Vb=[1,21],$Vc=[1,22],$Vd=[8,16,17,18,19,20,21,22,23,24,25,26],$Ve=[1,37],$Vf=[1,33],$Vg=[1,34],$Vh=[1,35],$Vi=[1,36],$Vj=[8,10,16,17,18,19,20,21,22,23,24,25,26,28,32,37,39,40,45,57,58],$Vk=[10,28],$Vl=[10,28,37,57,58],$Vm=[2,49],$Vn=[1,45],$Vo=[1,48],$Vp=[1,49],$Vq=[1,52],$Vr=[2,65],$Vs=[1,65],$Vt=[1,66],$Vu=[1,67],$Vv=[1,68],$Vw=[1,69],$Vx=[1,70],$Vy=[1,71],$Vz=[1,72],$VA=[1,73],$VB=[8,16,17,18,19,20,21,22,23,24,25,26,47],$VC=[10,28,37]; var parser = {trace: function trace() { }, yy: {}, @@ -146,7 +146,13 @@ parseError: function parseError(str, hash) { if (hash.recoverable) { this.trace(str); } else { - throw new Error(str); + function _parseError (msg, hash) { + this.message = msg; + this.hash = hash; + } + _parseError.prototype = new Error(); + + throw new _parseError(str, hash); } }, parse: function parse(input) { @@ -718,9 +724,9 @@ return new Parser; if (typeof require !== 'undefined' && typeof exports !== 'undefined') { -exports.parser = parser; -exports.Parser = parser.Parser; -exports.parse = function () { return parser.parse.apply(parser, arguments); }; +exports.parser = dot; +exports.Parser = dot.Parser; +exports.parse = function () { return dot.parse.apply(dot, arguments); }; exports.main = function commonjsMain(args) { if (!args[1]) { console.log('Usage: '+args[0]+' FILE'); diff --git a/src/diagrams/flowchart/parser/flow.jison b/src/diagrams/flowchart/parser/flow.jison index f860d08c5b..55ad5d0cdf 100644 --- a/src/diagrams/flowchart/parser/flow.jison +++ b/src/diagrams/flowchart/parser/flow.jison @@ -63,7 +63,9 @@ \% return 'PCT'; "=" return 'EQUALS'; \= return 'EQUALS'; -[\u0021-\u0027\u002A-\u002E\u003F\u0041-\u005A\u005C\u005F-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6]| +[A-Za-z]+ return 'ALPHA'; +[!"#$%&'*+,-.`?\\_/] return 'PUNCTUATION'; +[\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]| @@ -121,10 +123,10 @@ [\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]]| +[\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC]| [\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF]| -[\uFFD2-\uFFD7\uFFDA-\uFFDC_\/] - return 'ALPHA'; +[\uFFD2-\uFFD7\uFFDA-\uFFDC] + return 'UNICODE_TEXT'; "|" return 'PIPE'; "(" return 'PS'; ")" return 'PE'; @@ -429,7 +431,7 @@ textToken : textNoTagsToken | TAGSTART | TAGEND | '==' | '--' | PCT | DEFA textNoTagsToken: alphaNumToken | SPACE | MINUS | keywords ; -alphaNumToken : ALPHA | NUM | COLON | COMMA | PLUS | EQUALS | MULT | DOT | BRKT ; +alphaNumToken : ALPHA | PUNCTUATION | UNICODE_TEXT | NUM | COLON | COMMA | PLUS | EQUALS | MULT | DOT | BRKT ; graphCodeTokens: PIPE | PS | PE | SQS | SQE | DIAMOND_START | DIAMOND_STOP | TAG_START | TAG_END | ARROW_CROSS | ARROW_POINT | ARROW_CIRCLE | ARROW_OPEN | QUOTE | SEMI ; %% diff --git a/src/diagrams/flowchart/parser/flow.js b/src/diagrams/flowchart/parser/flow.js index 023e54d559..83bafa81aa 100644 --- a/src/diagrams/flowchart/parser/flow.js +++ b/src/diagrams/flowchart/parser/flow.js @@ -71,13 +71,13 @@ recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error) } */ -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,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,205],$Va1=[8,9,11,83],$Vb1=[8,9,10,11,44,69,78,79,81,83,85,86,87,88,89]; +var flow = (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,18,30,44,69,70,71,72,73,79,83,85,86,88,89,91,92,93,94,95],$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,38],$Vj=[1,40],$Vk=[1,35],$Vl=[1,39],$Vm=[1,45],$Vn=[1,44],$Vo=[1,36],$Vp=[1,37],$Vq=[1,41],$Vr=[1,42],$Vs=[1,43],$Vt=[1,8,9,10,11,13,18,30,32,44,69,70,71,72,73,79,83,85,86,88,89,91,92,93,94,95],$Vu=[1,53],$Vv=[1,52],$Vw=[1,54],$Vx=[1,72],$Vy=[1,80],$Vz=[1,81],$VA=[1,66],$VB=[1,65],$VC=[1,85],$VD=[1,84],$VE=[1,82],$VF=[1,83],$VG=[1,73],$VH=[1,68],$VI=[1,67],$VJ=[1,63],$VK=[1,75],$VL=[1,76],$VM=[1,77],$VN=[1,78],$VO=[1,79],$VP=[1,70],$VQ=[1,69],$VR=[8,9,11],$VS=[8,9,11,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62],$VT=[1,114],$VU=[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,94,95],$VV=[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,94,95],$VW=[1,116],$VX=[1,117],$VY=[8,9,10,11,13,18,30,32,44,69,70,71,72,73,79,83,85,86,88,89,91,92,93,94,95],$VZ=[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,94,95],$V_=[13,18,44,79,83,85,86,88,89,91,92,93,94,95],$V$=[13,18,44,47,63,79,83,85,86,88,89,91,92,93,94,95],$V01=[1,188],$V11=[1,185],$V21=[1,192],$V31=[1,189],$V41=[1,186],$V51=[1,193],$V61=[1,183],$V71=[1,184],$V81=[1,187],$V91=[1,190],$Va1=[1,191],$Vb1=[1,207],$Vc1=[8,9,11,83],$Vd1=[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,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],[29,7],[29,5],[29,7],[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]], +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,"PUNCTUATION":91,"UNICODE_TEXT":92,"PLUS":93,"EQUALS":94,"MULT":95,"TAG_START":96,"TAG_END":97,"QUOTE":98,"$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:"PUNCTUATION",92:"UNICODE_TEXT",93:"PLUS",94:"EQUALS",95:"MULT",96:"TAG_START",97:"TAG_END",98:"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,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],[29,7],[29,5],[29,7],[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],[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 */ @@ -293,13 +293,19 @@ 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,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,148]),o($VT,[2,149]),o($VT,[2,150]),o($VT,[2,151]),o($VT,[2,152]),o($VT,[2,153]),o($VT,[2,154]),o($VT,[2,155]),o($VT,[2,156]),{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,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,145]),o($VX,[2,146]),o($VX,[2,147]),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,65:[1,199],79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq},o($VQ,[2,43],{21:200,10:$VR}),{10:$Vv,12:$Vw,13:$Vx,15:$Vy,16:$Vz,17:$VA,18:$VB,30:$VC,32:$VD,39:[1,201],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:202,10:$VR}),o($VQ,[2,49],{21:203,10:$VR}),o($VQ,[2,51],{21:204,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,115],{83:$V91}),o($Va1,[2,120],{84:206,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,122]),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($Vb1,[2,132]),o($Vb1,[2,133]),o($Vb1,[2,134]),o($VP,[2,116],{83:$V91}),o($VP,[2,117],{83:$V91}),o($VP,[2,118],{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,10:[1,207],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,113],{10:[1,208]}),o($VQ,[2,44]),{39:[1,209]},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:210,84:180,85:$V41,86:$V51,87:$V61,88:$V71,89:$V81},o($Vb1,[2,123]),{65:[1,211]},{65:[1,212]},o($VQ,[2,45],{21:213,10:$VR}),o($Va1,[2,121],{84:206,10:$V_,44:$V$,69:$V01,78:$V11,79:$V21,81:$V31,85:$V41,86:$V51,87:$V61,88:$V71,89:$V81}),o($VP,[2,112]),o($VP,[2,114]),o($VQ,[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,94:$Vr,95:$Vs},o($V3,[2,9]),o($V3,[2,10]),{13:[1,46],15:[1,47],16:[1,48],17:[1,49],18:[1,50]},o($Vt,[2,3]),o($Vt,[2,4]),o($Vt,[2,5]),o($Vt,[2,6]),o($Vt,[2,7]),o($Vt,[2,8]),{8:$Vu,9:$Vv,11:$Vw,24:51},{8:$Vu,9:$Vv,11:$Vw,24:55},{8:$Vu,9:$Vv,11:$Vw,24:56},{8:$Vu,9:$Vv,11:$Vw,24:57},{8:$Vu,9:$Vv,11:$Vw,24:58},{8:$Vu,9:$Vv,11:$Vw,24:59},{8:$Vu,9:$Vv,10:$Vx,11:$Vw,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,24:61,30:$VE,31:60,32:$VF,43:71,44:$VG,48:$VH,58:$VI,64:62,65:$VJ,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},o($VR,[2,42],{34:86,45:87,48:[1,88],49:[1,91],50:[1,92],51:[1,93],52:[1,94],53:[1,89],54:[1,95],55:[1,96],56:[1,97],57:[1,98],58:[1,90],59:[1,99],60:[1,100],61:[1,101],62:[1,102]}),{10:[1,103]},{10:[1,104]},{10:[1,105]},{10:[1,106]},{10:[1,107]},o($VS,[2,53],{43:32,21:112,42:113,10:$VT,13:$V9,15:[1,111],18:$Va,36:[1,108],38:[1,109],40:[1,110],44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs}),o($VU,[2,55]),o($VU,[2,57]),o($VU,[2,58]),o($VU,[2,59]),o($VU,[2,60]),o($VV,[2,148]),o($VV,[2,149]),o($VV,[2,150]),o($VV,[2,151]),o($VV,[2,152]),o($VV,[2,153]),o($VV,[2,154]),o($VV,[2,155]),o($VV,[2,156]),o($VV,[2,157]),o($VV,[2,158]),{8:$VW,9:$VX,10:$VT,14:115,21:118},{8:$VW,9:$VX,10:$VT,14:119,21:118},{8:$VW,9:$VX,10:$VT,14:120,21:118},{8:$VW,9:$VX,10:$VT,14:121,21:118},{8:$VW,9:$VX,10:$VT,14:122,21:118},o($Vt,[2,30]),o($Vt,[2,38]),o($Vt,[2,39]),o($Vt,[2,40]),o($Vt,[2,31]),o($Vt,[2,32]),o($Vt,[2,33]),o($Vt,[2,34]),o($Vt,[2,35]),{8:$Vu,9:$Vv,10:$Vx,11:$Vw,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,24:123,30:$VE,32:$VF,43:71,44:$VG,48:$VH,58:$VI,64:124,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},o($VY,$V4,{5:125}),o($VZ,[2,90]),o($VZ,[2,92]),o($VZ,[2,137]),o($VZ,[2,138]),o($VZ,[2,139]),o($VZ,[2,140]),o($VZ,[2,141]),o($VZ,[2,142]),o($VZ,[2,143]),o($VZ,[2,144]),o($VZ,[2,145]),o($VZ,[2,146]),o($VZ,[2,147]),o($VZ,[2,95]),o($VZ,[2,96]),o($VZ,[2,97]),o($VZ,[2,98]),o($VZ,[2,99]),o($VZ,[2,100]),o($VZ,[2,101]),o($VZ,[2,102]),o($VZ,[2,103]),o($VZ,[2,104]),o($VZ,[2,105]),{13:$V9,18:$Va,33:126,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,94:$Vr,95:$Vs},o($V_,[2,64],{46:127,47:[1,128],63:[1,129]}),{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:130,32:$VF,43:71,44:$VG,48:$VH,58:$VI,64:62,65:$VJ,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:131,32:$VF,43:71,44:$VG,48:$VH,58:$VI,64:62,65:$VJ,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:132,32:$VF,43:71,44:$VG,48:$VH,58:$VI,64:62,65:$VJ,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},o($V$,[2,77]),o($V$,[2,78]),o($V$,[2,79]),o($V$,[2,80]),o($V$,[2,81]),o($V$,[2,82]),o($V$,[2,83]),o($V$,[2,84]),o($V$,[2,85]),o($V$,[2,86]),o($V$,[2,87]),o($V$,[2,88]),{13:$V9,18:$Va,35:133,42:30,43:32,44:$Vc,78:[1,134],79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{76:[1,135],79:[1,136]},{13:$V9,18:$Va,35:138,42:30,43:32,44:$Vc,76:[1,137],79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{13:$V9,18:$Va,35:139,42:30,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{13:$V9,18:$Va,35:140,42:30,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:141,32:$VF,43:71,44:$VG,48:$VH,58:$VI,64:62,65:$VJ,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:143,32:$VF,38:[1,142],43:71,44:$VG,48:$VH,58:$VI,64:62,65:$VJ,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:144,32:$VF,43:71,44:$VG,48:$VH,58:$VI,64:62,65:$VJ,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:145,32:$VF,43:71,44:$VG,48:$VH,58:$VI,64:62,65:$VJ,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},o($VS,[2,54]),o($VU,[2,56]),o($VS,[2,29],{21:146,10:$VT}),o($V3,[2,11]),o($V3,[2,21]),o($V3,[2,22]),{9:[1,147]},o($V3,[2,12]),o($V3,[2,13]),o($V3,[2,14]),o($V3,[2,15]),o($VY,$V4,{5:148}),o($VZ,[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,149],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,94:$Vr,95:$Vs},o($VR,[2,41]),o($V_,[2,61],{10:[1,150]}),{10:[1,151]},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:152,32:$VF,43:71,44:$VG,48:$VH,58:$VI,64:62,65:$VJ,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,43:71,44:$VG,48:$VH,49:[1,153],50:[1,154],51:[1,155],52:[1,156],58:$VI,64:124,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,43:71,44:$VG,48:$VH,54:[1,157],55:[1,158],56:[1,159],57:[1,160],58:$VI,64:124,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,43:71,44:$VG,48:$VH,58:$VI,59:[1,161],60:[1,162],61:[1,163],62:[1,164],64:124,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:[1,165],13:$V9,18:$Va,42:113,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:[1,166]},{10:[1,167]},{10:[1,168]},{10:[1,169]},{10:[1,170],13:$V9,18:$Va,42:113,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:[1,171],13:$V9,18:$Va,42:113,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:[1,172],13:$V9,18:$Va,42:113,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,37:[1,173],43:71,44:$VG,48:$VH,58:$VI,64:124,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,31:174,32:$VF,43:71,44:$VG,48:$VH,58:$VI,64:62,65:$VJ,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,39:[1,175],43:71,44:$VG,48:$VH,58:$VI,64:124,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,41:[1,176],43:71,44:$VG,48:$VH,58:$VI,64:124,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,37:[1,177],43:71,44:$VG,48:$VH,58:$VI,64:124,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},o($VS,[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,178],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,94:$Vr,95:$Vs},o($Vt,[2,37]),o($V_,[2,63]),o($V_,[2,62]),{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,43:71,44:$VG,48:$VH,58:$VI,63:[1,179],64:124,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},o($V_,[2,65]),o($V_,[2,66]),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($V_,[2,74]),o($V_,[2,75]),o($V_,[2,76]),{10:$V01,44:$V11,69:$V21,77:180,78:$V31,79:$V41,81:$V51,82:181,84:182,85:$V61,86:$V71,87:$V81,88:$V91,89:$Va1},{10:$V01,44:$V11,69:$V21,77:194,78:$V31,79:$V41,81:$V51,82:181,84:182,85:$V61,86:$V71,87:$V81,88:$V91,89:$Va1},{10:$V01,44:$V11,69:$V21,77:195,78:$V31,79:$V41,81:$V51,82:181,84:182,85:$V61,86:$V71,87:$V81,88:$V91,89:$Va1},{10:$V01,44:$V11,69:$V21,77:196,78:$V31,79:$V41,81:$V51,82:181,84:182,85:$V61,86:$V71,87:$V81,88:$V91,89:$Va1},{10:$V01,44:$V11,69:$V21,77:197,78:$V31,79:$V41,81:$V51,82:181,84:182,85:$V61,86:$V71,87:$V81,88:$V91,89:$Va1},{10:$V01,44:$V11,69:$V21,77:198,78:$V31,79:$V41,81:$V51,82:181,84:182,85:$V61,86:$V71,87:$V81,88:$V91,89:$Va1},{13:$V9,18:$Va,35:199,42:30,43:32,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},{13:$V9,18:$Va,35:200,42:30,43:32,44:$Vc,65:[1,201],79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},o($VS,[2,43],{21:202,10:$VT}),{10:$Vx,12:$Vy,13:$Vz,15:$VA,16:$VB,17:$VC,18:$VD,30:$VE,32:$VF,39:[1,203],43:71,44:$VG,48:$VH,58:$VI,64:124,68:74,69:$VK,70:$VL,71:$VM,72:$VN,73:$VO,75:64,76:$VP,79:$Vi,81:$VQ,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs},o($VS,[2,47],{21:204,10:$VT}),o($VS,[2,49],{21:205,10:$VT}),o($VS,[2,51],{21:206,10:$VT}),o($Vt,[2,36]),o([10,13,18,44,79,83,85,86,88,89,91,92,93,94,95],[2,89]),o($VR,[2,115],{83:$Vb1}),o($Vc1,[2,120],{84:208,10:$V01,44:$V11,69:$V21,78:$V31,79:$V41,81:$V51,85:$V61,86:$V71,87:$V81,88:$V91,89:$Va1}),o($Vd1,[2,122]),o($Vd1,[2,124]),o($Vd1,[2,125]),o($Vd1,[2,126]),o($Vd1,[2,127]),o($Vd1,[2,128]),o($Vd1,[2,129]),o($Vd1,[2,130]),o($Vd1,[2,131]),o($Vd1,[2,132]),o($Vd1,[2,133]),o($Vd1,[2,134]),o($VR,[2,116],{83:$Vb1}),o($VR,[2,117],{83:$Vb1}),o($VR,[2,118],{83:$Vb1}),o($VR,[2,108],{83:$Vb1}),o($VR,[2,109],{83:$Vb1}),o($VR,[2,110],{43:32,42:113,13:$V9,18:$Va,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs}),o($VR,[2,111],{43:32,42:113,10:[1,209],13:$V9,18:$Va,44:$Vc,79:$Vi,83:$Vj,85:$Vk,86:$Vl,88:$Vm,89:$Vn,91:$Vo,92:$Vp,93:$Vq,94:$Vr,95:$Vs}),o($VR,[2,113],{10:[1,210]}),o($VS,[2,44]),{39:[1,211]},o($VS,[2,48]),o($VS,[2,50]),o($VS,[2,52]),{10:$V01,44:$V11,69:$V21,78:$V31,79:$V41,81:$V51,82:212,84:182,85:$V61,86:$V71,87:$V81,88:$V91,89:$Va1},o($Vd1,[2,123]),{65:[1,213]},{65:[1,214]},o($VS,[2,45],{21:215,10:$VT}),o($Vc1,[2,121],{84:208,10:$V01,44:$V11,69:$V21,78:$V31,79:$V41,81:$V51,85:$V61,86:$V71,87:$V81,88:$V91,89:$Va1}),o($VR,[2,112]),o($VR,[2,114]),o($VS,[2,46])], defaultActions: {}, parseError: function parseError(str, hash) { if (hash.recoverable) { this.trace(str); } else { - throw new Error(str); + function _parseError (msg, hash) { + this.message = msg; + this.hash = hash; + } + _parseError.prototype = new Error(); + + throw new _parseError(str, hash); } }, parse: function parse(input) { @@ -816,7 +822,7 @@ case 22:return 8; break; case 23:return 83; break; -case 24:return 93; +case 24:return 95; break; case 25:return 16; break; @@ -868,42 +874,46 @@ case 48:return 44; break; case 49:return 89; break; -case 50:return 91; +case 50:return 93; break; case 51:return 81; break; -case 52:return 92; +case 52:return 94; break; -case 53:return 92; +case 53:return 94; break; case 54:return 85; break; -case 55:return 63; +case 55:return 91; +break; +case 56:return 92; +break; +case 57:return 63; break; -case 56:return 38; +case 58:return 38; break; -case 57:return 39; +case 59:return 39; break; -case 58:return 36; +case 60:return 36; break; -case 59:return 37; +case 61:return 37; break; -case 60:return 40 +case 62:return 40 break; -case 61:return 41 +case 63:return 41 break; -case 62:return 96; +case 64:return 98; break; -case 63:return 9; +case 65:return 9; break; -case 64:return 10; +case 66:return 10; break; -case 65:return 11; +case 67:return 11; break; } }, -rules: [/^(?:%%[^\n]*)/,/^(?:["])/,/^(?:["])/,/^(?:[^"]*)/,/^(?:style\b)/,/^(?:default\b)/,/^(?:linkStyle\b)/,/^(?:classDef\b)/,/^(?:class\b)/,/^(?:click\b)/,/^(?:graph\b)/,/^(?:subgraph\b)/,/^(?:end\b\s*)/,/^(?:LR\b)/,/^(?:RL\b)/,/^(?:TB\b)/,/^(?:BT\b)/,/^(?:TD\b)/,/^(?:BR\b)/,/^(?:[0-9]+)/,/^(?:#)/,/^(?::)/,/^(?:;)/,/^(?:,)/,/^(?:\*)/,/^(?:<)/,/^(?:>)/,/^(?:\^)/,/^(?:v\b)/,/^(?:\s*--[x]\s*)/,/^(?:\s*-->\s*)/,/^(?:\s*--[o]\s*)/,/^(?:\s*---\s*)/,/^(?:\s*-\.-[x]\s*)/,/^(?:\s*-\.->\s*)/,/^(?:\s*-\.-[o]\s*)/,/^(?:\s*-\.-\s*)/,/^(?:\s*.-[x]\s*)/,/^(?:\s*\.->\s*)/,/^(?:\s*\.-[o]\s*)/,/^(?:\s*\.-\s*)/,/^(?:\s*==[x]\s*)/,/^(?:\s*==>\s*)/,/^(?:\s*==[o]\s*)/,/^(?:\s*==[\=]\s*)/,/^(?:\s*--\s*)/,/^(?:\s*-\.\s*)/,/^(?:\s*==\s*)/,/^(?:-)/,/^(?:\.)/,/^(?:\+)/,/^(?:%)/,/^(?:=)/,/^(?:=)/,/^(?:[\u0021-\u0027\u002A-\u002E\u003F\u0041-\u005A\u005C\u005F-\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: {"string":{"rules":[2,3],"inclusive":false},"INITIAL":{"rules":[0,1,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65],"inclusive":true}} +rules: [/^(?:%%[^\n]*)/,/^(?:["])/,/^(?:["])/,/^(?:[^"]*)/,/^(?:style\b)/,/^(?:default\b)/,/^(?:linkStyle\b)/,/^(?:classDef\b)/,/^(?:class\b)/,/^(?:click\b)/,/^(?:graph\b)/,/^(?:subgraph\b)/,/^(?:end\b\s*)/,/^(?:LR\b)/,/^(?:RL\b)/,/^(?:TB\b)/,/^(?:BT\b)/,/^(?:TD\b)/,/^(?:BR\b)/,/^(?:[0-9]+)/,/^(?:#)/,/^(?::)/,/^(?:;)/,/^(?:,)/,/^(?:\*)/,/^(?:<)/,/^(?:>)/,/^(?:\^)/,/^(?:v\b)/,/^(?:\s*--[x]\s*)/,/^(?:\s*-->\s*)/,/^(?:\s*--[o]\s*)/,/^(?:\s*---\s*)/,/^(?:\s*-\.-[x]\s*)/,/^(?:\s*-\.->\s*)/,/^(?:\s*-\.-[o]\s*)/,/^(?:\s*-\.-\s*)/,/^(?:\s*.-[x]\s*)/,/^(?:\s*\.->\s*)/,/^(?:\s*\.-[o]\s*)/,/^(?:\s*\.-\s*)/,/^(?:\s*==[x]\s*)/,/^(?:\s*==>\s*)/,/^(?:\s*==[o]\s*)/,/^(?:\s*==[\=]\s*)/,/^(?:\s*--\s*)/,/^(?:\s*-\.\s*)/,/^(?:\s*==\s*)/,/^(?:-)/,/^(?:\.)/,/^(?:\+)/,/^(?:%)/,/^(?:=)/,/^(?:=)/,/^(?:[A-Za-z]+)/,/^(?:[!"#$%&'*+,-.`?\\_\/])/,/^(?:[\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: {"string":{"rules":[2,3],"inclusive":false},"INITIAL":{"rules":[0,1,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67],"inclusive":true}} }); return lexer; })(); @@ -917,9 +927,9 @@ return new Parser; if (typeof require !== 'undefined' && typeof exports !== 'undefined') { -exports.parser = parser; -exports.Parser = parser.Parser; -exports.parse = function () { return parser.parse.apply(parser, arguments); }; +exports.parser = flow; +exports.Parser = flow.Parser; +exports.parse = function () { return flow.parse.apply(flow, arguments); }; exports.main = function commonjsMain(args) { if (!args[1]) { console.log('Usage: '+args[0]+' FILE'); diff --git a/src/diagrams/flowchart/parser/flow.spec.js b/src/diagrams/flowchart/parser/flow.spec.js index 322bdcf28b..1bfcdd5b4e 100644 --- a/src/diagrams/flowchart/parser/flow.spec.js +++ b/src/diagrams/flowchart/parser/flow.spec.js @@ -320,6 +320,18 @@ describe('when parsing ',function(){ expect(edges[0].end).toBe('sender'); }); + it('should handle node names ending with keywords',function(){ + var res = flow.parser.parse('graph TD\nblend --> monograph'); + + var vert = flow.parser.yy.getVertices(); + var edges = flow.parser.yy.getEdges(); + + expect(vert['blend'].id).toBe('blend'); + expect(vert['monograph'].id).toBe('monograph'); + expect(edges[0].start).toBe('blend'); + expect(edges[0].end).toBe('monograph'); + }); + it('should handle open ended edges',function(){ var res = flow.parser.parse('graph TD;A---B;'); diff --git a/src/diagrams/gantt/parser/gantt.js b/src/diagrams/gantt/parser/gantt.js index 3ffdbc5e34..a781cdd78b 100644 --- a/src/diagrams/gantt/parser/gantt.js +++ b/src/diagrams/gantt/parser/gantt.js @@ -71,7 +71,7 @@ recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error) } */ -var parser = (function(){ +var gantt = (function(){ var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[6,8,10,11,12,13,14],$V1=[1,9],$V2=[1,10],$V3=[1,11],$V4=[1,12]; var parser = {trace: function trace() { }, yy: {}, @@ -118,7 +118,13 @@ parseError: function parseError(str, hash) { if (hash.recoverable) { this.trace(str); } else { - throw new Error(str); + function _parseError (msg, hash) { + this.message = msg; + this.hash = hash; + } + _parseError.prototype = new Error(); + + throw new _parseError(str, hash); } }, parse: function parse(input) { @@ -633,9 +639,9 @@ return new Parser; if (typeof require !== 'undefined' && typeof exports !== 'undefined') { -exports.parser = parser; -exports.Parser = parser.Parser; -exports.parse = function () { return parser.parse.apply(parser, arguments); }; +exports.parser = gantt; +exports.Parser = gantt.Parser; +exports.parse = function () { return gantt.parse.apply(gantt, arguments); }; exports.main = function commonjsMain(args) { if (!args[1]) { console.log('Usage: '+args[0]+' FILE'); diff --git a/src/diagrams/sequenceDiagram/parser/sequenceDiagram.js b/src/diagrams/sequenceDiagram/parser/sequenceDiagram.js index 45b2bfba2a..493d6cccf3 100644 --- a/src/diagrams/sequenceDiagram/parser/sequenceDiagram.js +++ b/src/diagrams/sequenceDiagram/parser/sequenceDiagram.js @@ -71,7 +71,7 @@ recoverable: (boolean: TRUE when the parser has a error recovery rule available for this particular error) } */ -var parser = (function(){ +var sequenceDiagram = (function(){ var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[6,8,10,11,15,17,19,20,22,33],$V1=[2,2],$V2=[1,6],$V3=[1,8],$V4=[1,9],$V5=[1,12],$V6=[1,13],$V7=[1,14],$V8=[1,15],$V9=[1,17],$Va=[1,18],$Vb=[2,7],$Vc=[6,8,10,11,15,17,18,19,20,21,22,33],$Vd=[6,8,10,11,15,17,18,19,20,22,33],$Ve=[1,46],$Vf=[1,49],$Vg=[1,53]; var parser = {trace: function trace() { }, yy: {}, @@ -177,7 +177,13 @@ parseError: function parseError(str, hash) { if (hash.recoverable) { this.trace(str); } else { - throw new Error(str); + function _parseError (msg, hash) { + this.message = msg; + this.hash = hash; + } + _parseError.prototype = new Error(); + + throw new _parseError(str, hash); } }, parse: function parse(input) { @@ -724,9 +730,9 @@ return new Parser; if (typeof require !== 'undefined' && typeof exports !== 'undefined') { -exports.parser = parser; -exports.Parser = parser.Parser; -exports.parse = function () { return parser.parse.apply(parser, arguments); }; +exports.parser = sequenceDiagram; +exports.Parser = sequenceDiagram.Parser; +exports.parse = function () { return sequenceDiagram.parse.apply(sequenceDiagram, arguments); }; exports.main = function commonjsMain(args) { if (!args[1]) { console.log('Usage: '+args[0]+' FILE');