Style in place for edges

dependency on requirejs removed
dist in place
This commit is contained in:
knsv
2014-11-13 19:51:05 +01:00
parent e7cb84b1d9
commit 512b333658
20 changed files with 618 additions and 1491 deletions

View File

@@ -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=[5,8];
var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,3],$V1=[1,7],$V2=[1,8],$V3=[8,12,24],$V4=[1,24],$V5=[8,19,21,23],$V6=[1,48],$V7=[1,43],$V8=[1,49],$V9=[1,45],$Va=[1,44],$Vb=[1,46],$Vc=[1,47],$Vd=[1,53],$Ve=[8,29],$Vf=[6,8,15,17,24,29,31,32,33];
var parser = {trace: function trace() { },
yy: {},
symbols_: {"error":2,"expressions":3,"id":4,"EOF":5,"flow":6,"STYLE":7,"MINUS":8,"word":9,"ALPHA":10,"$accept":0,"$end":1},
terminals_: {2:"error",5:"EOF",7:"STYLE",8:"MINUS",10:"ALPHA"},
productions_: [0,[3,2],[6,1],[6,1],[4,3],[4,1],[9,1]],
symbols_: {"error":2,"expressions":3,"graph":4,"EOF":5,"SPACE":6,"edge":7,";":8,"styleStatement":9,"vertex":10,"link":11,"PIPE":12,"text":13,"STYLE":14,"ALPHA":15,"stylesOpt":16,"HEX":17,"SQS":18,"SQE":19,"PS":20,"PE":21,"DIAMOND_START":22,"DIAMOND_STOP":23,"MINUS":24,"ARROW_POINT":25,"ARROW_CIRCLE":26,"ARROW_CROSS":27,"style":28,"COMMA":29,"styleComponent":30,"COLON":31,"NUM":32,"UNIT":33,"colordef":34,"COLOR":35,"borderWidth":36,"borderStyle":37,"BORDER_STYLE":38,"$accept":0,"$end":1},
terminals_: {2:"error",5:"EOF",6:"SPACE",8:";",12:"PIPE",14:"STYLE",15:"ALPHA",17:"HEX",18:"SQS",19:"SQE",20:"PS",21:"PE",22:"DIAMOND_START",23:"DIAMOND_STOP",24:"MINUS",25:"ARROW_POINT",26:"ARROW_CIRCLE",27:"ARROW_CROSS",29:"COMMA",31:"COLON",32:"NUM",33:"UNIT",35:"COLOR",38:"BORDER_STYLE"},
productions_: [0,[3,2],[4,2],[4,3],[4,2],[7,1],[7,5],[7,3],[7,1],[9,5],[9,5],[10,4],[10,4],[10,4],[10,1],[13,3],[13,3],[13,2],[13,1],[11,3],[11,3],[11,3],[11,3],[16,1],[16,3],[28,1],[28,2],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[34,1],[34,1],[36,2],[37,1]],
performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
/* this == yyval */
@@ -86,22 +86,91 @@ switch (yystate) {
case 1:
return $$[$0-1];
break;
case 2:
this.$='key';
break;
case 3:
this.$=$$[$0];
case 2: case 3:
this.$ = $$[$0];
break;
case 4:
this.$=$$[$0-2]+'-'+$$[$0]
this.$ = $$[$0-1];
break;
case 5: case 6:
case 5:
this.$ = 'ya';
break;
case 6:
yy.addLink($$[$0-4],$$[$0-2],$$[$0-3],$$[$0]);this.$ = 'oy'
break;
case 7:
yy.addLink($$[$0-2],$$[$0],$$[$0-1]);this.$ = 'oy'
break;
case 8:
this.$ = 'yo';
break;
case 9:
this.$ = $$[$0-4];yy.addVertex($$[$0-2],undefined,undefined,$$[$0]);
break;
case 10:
console.log('In parser - style: '+$$[$0]);this.$ = $$[$0-4];yy.updateLink($$[$0-2],$$[$0]);
break;
case 11:
this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'square');
break;
case 12:
this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'round');
break;
case 13:
this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'diamond');
break;
case 14:
this.$ = $$[$0];yy.addVertex($$[$0]);
break;
case 15:
this.$ = $$[$0-2] + ' ' +$$[$0];
break;
case 16:
this.$ = $$[$0-2] + '-' +$$[$0];
break;
case 17:
this.$ = $$[$0-1];
break;
case 18: case 37:
this.$ = $$[$0];
break;
case 19:
this.$ = {"type":"arrow"};
break;
case 20:
this.$ = {"type":"arrow_circle"};
break;
case 21:
this.$ = {"type":"arrow_cross"};
break;
case 22:
this.$ = {"type":"arrow_open"};
break;
case 23:
this.$ = [$$[$0]]
break;
case 24:
$$[$0-2].push($$[$0]);this.$ = $$[$0-2];
break;
case 25:
this.$=$$[$0];
break;
case 26:
this.$ = $$[$0-1] + $$[$0];
break;
case 27: case 28: case 29: case 30: case 31: case 32: case 33:
this.$=$$[$0]
break;
case 34: case 35:
this.$ = yytext;
break;
case 36:
this.$ = $$[$0-1]+''+$$[$0];
break;
}
},
table: [{3:1,4:2,9:3,10:$V0},{1:[3]},{5:[1,5],8:[1,6]},o($V1,[2,5]),o($V1,[2,6]),{1:[2,1]},{9:7,10:$V0},o($V1,[2,4])],
defaultActions: {5:[2,1]},
table: [{3:1,4:2,6:$V0,7:4,9:5,10:6,14:$V1,15:$V2},{1:[3]},{5:[1,9]},{4:10,6:$V0,7:4,9:5,10:6,14:$V1,15:$V2},{8:[1,11]},{8:[2,5]},{8:[2,8],11:12,24:[1,13]},{6:[1,14]},o($V3,[2,14],{18:[1,15],20:[1,16],22:[1,17]}),{1:[2,1]},{5:[2,2]},{4:18,5:[2,4],6:$V0,7:4,9:5,10:6,14:$V1,15:$V2},{10:19,15:$V2},{24:[1,20]},{15:[1,21],17:[1,22]},{13:23,15:$V4},{13:25,15:$V4},{13:26,15:$V4},{5:[2,3]},{8:[2,7],12:[1,27]},{24:[1,31],25:[1,28],26:[1,29],27:[1,30]},{6:[1,32]},{6:[1,33]},{19:[1,34]},o($V5,[2,18],{6:[1,35],24:[1,36]}),{21:[1,37]},{23:[1,38]},{13:39,15:$V4},{15:[2,19]},{15:[2,20]},{15:[2,21]},{15:[2,22]},{6:$V6,15:$V7,16:40,17:$V8,24:$V9,28:41,30:42,31:$Va,32:$Vb,33:$Vc},{6:$V6,15:$V7,16:50,17:$V8,24:$V9,28:41,30:42,31:$Va,32:$Vb,33:$Vc},o($V3,[2,11]),o($V5,[2,17],{13:51,15:$V4}),{13:52,15:$V4},o($V3,[2,12]),o($V3,[2,13]),{8:[2,6]},{8:[2,9],29:$Vd},o($Ve,[2,23],{30:54,6:$V6,15:$V7,17:$V8,24:$V9,31:$Va,32:$Vb,33:$Vc}),o($Vf,[2,25]),o($Vf,[2,27]),o($Vf,[2,28]),o($Vf,[2,29]),o($Vf,[2,30]),o($Vf,[2,31]),o($Vf,[2,32]),o($Vf,[2,33]),{8:[2,10],29:$Vd},o($V5,[2,15]),o($V5,[2,16]),{6:$V6,15:$V7,17:$V8,24:$V9,28:55,30:42,31:$Va,32:$Vb,33:$Vc},o($Vf,[2,26]),o($Ve,[2,24],{30:54,6:$V6,15:$V7,17:$V8,24:$V9,31:$Va,32:$Vb,33:$Vc})],
defaultActions: {5:[2,5],9:[2,1],10:[2,2],18:[2,3],28:[2,19],29:[2,20],30:[2,21],31:[2,22],39:[2,6]},
parseError: function parseError(str, hash) {
if (hash.recoverable) {
this.trace(str);
@@ -171,7 +240,7 @@ parse: function parse(input) {
} else {
errStr = 'Parse error on line ' + (yylineno + 1) + ': Unexpected ' + (symbol == EOF ? 'end of input' : '\'' + (this.terminals_[symbol] || symbol) + '\'');
}
console.log(errStr, {
this.parseError(errStr, {
text: lexer.match,
token: this.terminals_[symbol] || symbol,
line: lexer.yylineno,
@@ -247,10 +316,9 @@ parse: function parse(input) {
return true;
}};
define('parser/flow',function(){
console.log('bcs123');
/*define('parser/mermaid',function(){
return parser;
});/* generated by jison-lex 0.3.4 */
});*//* generated by jison-lex 0.3.4 */
var lexer = (function(){
var lexer = ({
@@ -578,58 +646,60 @@ options: {},
performAction: function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
var YYSTATE=YY_START;
switch($avoiding_name_collisions) {
case 0:return 7;
case 0:return 14;
break;
case 1:return 10;
case 1:return 17;
break;
case 2:return 'HEX';
case 2:return 32;
break;
case 3:return 'NUM';
case 3:return 'BRKT';
break;
case 4:return 'UNIT';
case 4:return 33;
break;
case 5:return 'UNIT';
case 5:return 33;
break;
case 6:return 'UNIT';
case 6:return 33;
break;
case 7:return 'COLON';
case 7:return 31;
break;
case 8:return 8;
case 8:return 24;
break;
case 9:return ';';
case 9:return 8;
break;
case 10:return 'COMMA';
case 10:return 29;
break;
case 11:return 'ARROW_CROSS';
case 11:return 27;
break;
case 12:return 'ARROW_POINT';
case 12:return 25;
break;
case 13:return 'ARROW_CIRCLE';
case 13:return 26;
break;
case 14:return 'PIPE';
case 14:return 15;
break;
case 15:return 'PS';
case 15:return 12;
break;
case 16:return 'PE';
case 16:return 20;
break;
case 17:return 'SQS';
case 17:return 21;
break;
case 18:return 'SQE';
case 18:return 18;
break;
case 19:return 'DIAMOND_START'
case 19:return 19;
break;
case 20:return 'DIAMOND_STOP'
case 20:return 22
break;
case 21:return 'SPACE';
case 21:return 23
break;
case 22:return 'NEWLINE';
case 22:return 6;
break;
case 23:return 5;
case 23:return 'NEWLINE';
break;
case 24:return 5;
break;
}
},
rules: [/^(?:style\b)/,/^(?:[a-zåäöæøA-ZÅÄÖÆØ]+)/,/^(?:#[a-f0-9]+)/,/^(?:[0-9]+)/,/^(?:px\b)/,/^(?:pt\b)/,/^(?:dot\b)/,/^(?::)/,/^(?:-)/,/^(?:;)/,/^(?:,)/,/^(?:[x])/,/^(?:>)/,/^(?:[o])/,/^(?:\|)/,/^(?:\()/,/^(?:\))/,/^(?:\[)/,/^(?:\])/,/^(?:\{)/,/^(?:\})/,/^(?:\s)/,/^(?:\n)/,/^(?:$)/],
conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23],"inclusive":true}}
rules: [/^(?:style\b)/,/^(?:#[a-f0-9]+)/,/^(?:[0-9]+)/,/^(?:#)/,/^(?:px\b)/,/^(?:pt\b)/,/^(?:dot\b)/,/^(?::)/,/^(?:-)/,/^(?:;)/,/^(?:,)/,/^(?:[x])/,/^(?:>)/,/^(?:[o])/,/^(?:[a-zåäöæøA-ZÅÄÖÆØ]+)/,/^(?:\|)/,/^(?:\()/,/^(?:\))/,/^(?:\[)/,/^(?:\])/,/^(?:\{)/,/^(?:\})/,/^(?:\s)/,/^(?:\n)/,/^(?:$)/],
conditions: {"INITIAL":{"rules":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24],"inclusive":true}}
});
return lexer;
})();
@@ -657,4 +727,4 @@ exports.main = function commonjsMain(args) {
if (typeof module !== 'undefined' && require.main === module) {
exports.main(process.argv.slice(1));
}
}
}