marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-19 07:19:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added subgraphs in new grammar

Browse Source
This commit is contained in:
knsv
2015-06-13 18:34:45 +02:00
parent 6eb018489e
commit e5c16fd960
1 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/diagrams/flow2/parser/flow2.jison
View File

@@ -15,10 +15,10 @@
%% %%
\%\%[^\n]* /* do nothing */ \%\%[^\n]* return 'COMMENT';
/*[>][;] return 'TAGEND'; [>][;] return 'TAGEND';
[>][\n] return 'TAGEND';*/ [>][\n] return 'TAGEND';
["] this.begin("string"); ["] this.begin("string");
<string>["] this.popState(); <string>["] this.popState();
@@ -65,15 +65,16 @@
<roundVertex>[^\)]* {return "ROUND";} <roundVertex>[^\)]* {return "ROUND";}
\n+ return 'NEWLINE'; \n+ return 'NEWLINE';
\s+ /* do nothing */
"style" return 'STYLE'; "style"[\s]+.* return 'STYLE';
"default" return 'DEFAULT'; "default" return 'DEFAULT';
"linkStyle" return 'LINKSTYLE'; "linkStyle" return 'LINKSTYLE';
"classDef" return 'CLASSDEF'; "classDef" return 'CLASSDEF';
"class" return 'CLASS'; "class" return 'CLASS';
"click" return 'CLICK'; "click" return 'CLICK';
"graph" return 'GRAPH'; "graph"\s+ return 'GRAPH';
"subgraph" return 'subgraph'; "subgraph"\s+ return 'subgraph';
"end"\s* return 'end'; "end"\s* return 'end';
"LR" return 'DIR'; "LR" return 'DIR';
"RL" return 'DIR'; "RL" return 'DIR';
@@ -188,6 +189,7 @@
"\"" return 'QUOTE'; "\"" return 'QUOTE';
"say" return 'say'; "say" return 'say';
<<EOF>> return 'EOF'; <<EOF>> return 'EOF';
\s+ {console.log('S');return 'SP';}
. return 'INVALID'; . return 'INVALID';
/lex /lex
@@ -201,19 +203,24 @@
%% /* language grammar */ %% /* language grammar */
mermaidDoc: graphConfig lineEnd document mermaidDoc: initialComment
; ;
initialComment
: COMMENT lineEnd initialComment
| graphConfig document
;
graphConfig graphConfig
: GRAPH DIR : GRAPH DIR lineEnd
{ console.log('Got GCONF DIR');yy.setDirection($2);$$ = $2;} { console.log('Got GCONF DIR');yy.setDirection($2);$$ = $2;}
| GRAPH TAGEND | GRAPH TAGEND
{ yy.setDirection("LR");$$ = $2;} { yy.setDirection("LR");$$ = $2;}
| GRAPH TAGSTART | GRAPH TAGSTART lineEnd
{ yy.setDirection("RL");$$ = $2;} { yy.setDirection("RL");$$ = $2;}
| GRAPH UP | GRAPH UP lineEnd
{ yy.setDirection("BT");$$ = $2;} { yy.setDirection("BT");$$ = $2;}
| GRAPH DOWN | GRAPH DOWN lineEnd
{ console.log('Got TB');yy.setDirection("TB");$$ = $2;} { console.log('Got TB');yy.setDirection("TB");$$ = $2;}
; ;
@@ -226,11 +233,16 @@ line
: statement lineEnd {console.log('Got statement');} : statement lineEnd {console.log('Got statement');}
; ;
lineEnd: lineEnd2|lineEnd2 lineEnd; lineEnd: lineEnd2|lineEnd2 lineEnd;
lineEnd2:'NEWLINE'{console.log('Got line end');}| EOF| 'SEMI' {console.log('Got semi');}; lineEnd2:'NEWLINE'{console.log('Got line end');}| EOF| 'SP'|'SEMI' {console.log('Got semi');};
statement statement
: verticeStatement : verticeStatement
| STYLE { ;yy.handleStyleStatement($1);$$ = [$1];}
| COMMENT
| subgraph text lineEnd document end
{$$=yy.addSubGraph($4,$2);}
| subgraph lineEnd document end
{$$=yy.addSubGraph($3,undefined);}
; ;
verticeStatement: verticeStatement:
@@ -257,10 +269,6 @@ vertex: alphaNum vertexType
{$$ = {text:$1,type:'odd'};} {$$ = {text:$1,type:'odd'};}
; ;
link: linkStatement arrowText link: linkStatement arrowText
{$1.text = $2;$$ = $1;}
| linkStatement TESTSTR SPACE
{$1.text = $2;$$ = $1;}
| linkStatement arrowText SPACE
{$1.text = $2;$$ = $1;} {$1.text = $2;$$ = $1;}
| linkStatement | linkStatement
{$$ = $1;} {$$ = $1;}
@@ -352,7 +360,7 @@ commentText: commentToken
keywords keywords
: STYLE | LINKSTYLE | CLASSDEF | CLASS | CLICK | GRAPH | DIR | subgraph | end | DOWN | UP; : LINKSTYLE | CLASSDEF | CLASS | CLICK | GRAPH | DIR | subgraph | end | DOWN | UP;
textNoTags: textNoTagsToken textNoTags: textNoTagsToken
@@ -376,9 +384,9 @@ clickStatement:CLICK SPACE alphaNum SPACE alphaNum
{$$ = $1;yy.setClickEvent($3, $5);} {$$ = $1;yy.setClickEvent($3, $5);}
; ;
styleStatement:STYLE SPACE alphaNum SPACE stylesOpt styleStatement:STYLE alphaNum stylesOpt
{$$ = $1;yy.addVertex($3,undefined,undefined,$5);} {$$ = $1;yy.addVertex($3,undefined,undefined,$5);}
| STYLE SPACE HEX SPACE stylesOpt | STYLE HEX stylesOpt
{$$ = $1;yy.updateLink($3,$5);} {$$ = $1;yy.updateLink($3,$5);}
; ;