marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-08-29 13:16:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring/cleanup of flowchart grammar

Browse Source
This commit is contained in:
knsv
2014-12-13 18:01:25 +01:00
parent bfd93627a0
commit 8a13c4cc06
2 changed files with 65 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
src/diagrams/flowchart/parser/flow.jison
View File

@@ -208,26 +208,6 @@ alphaNumStatement
{$$=$1+'-'+$3;} {$$=$1+'-'+$3;}
; ;
alphaNumToken
: ALPHA
{$$=$1;}
| NUM
{$$=$1;}
| COLON
{$$ = $1;}
| COMMA
{$$ = $1;}
| PLUS
{$$ = $1;}
| EQUALS
{$$ = $1;}
| MULT
{$$ = $1;}
| DOT
{$$ = $1;}
| BRKT
{$$ = '<br>';}
;
link: linkStatement arrowText link: linkStatement arrowText
{$1.text = $2;$$ = $1;} {$1.text = $2;$$ = $1;}
@@ -260,35 +240,7 @@ text: textToken
{$$=$1+''+$2;} {$$=$1+''+$2;}
; ;
textToken: ALPHA
{$$=$1;}
| NUM
{$$=$1;}
| COLON
{$$ = $1;}
| COMMA
{$$ = $1;}
| PLUS
{$$ = $1;}
| EQUALS
{$$ = $1;}
| MULT
{$$ = $1;}
| DOT
{$$ = $1;}
| TAGSTART
{$$ = $1;}
| TAGEND
{$$ = $1;}
| BRKT
{$$ = '<br>';}
| SPACE
{$$ = $1;}
| MINUS
{$$ = $1;}
| keywords
{$$ = $1;}
;
commentText: commentToken commentText: commentToken
{$$=$1;} {$$=$1;}
@@ -296,65 +248,6 @@ commentText: commentToken
{$$=$1+''+$2;} {$$=$1+''+$2;}
; ;
commentToken: ALPHA
{$$=$1;}
| NUM
{$$=$1;}
| COLON
{$$ = $1;}
| COMMA
{$$ = $1;}
| PLUS
{$$ = $1;}
| EQUALS
{$$ = $1;}
| MULT
{$$ = $1;}
| DOT
{$$ = $1;}
| TAGSTART
{$$ = $1;}
| TAGEND
{$$ = $1;}
| BRKT
{$$ = '<br>';}
| PIPE
{$$ = '<br>';}
| PS
{$$ = '<br>';}
| PE
{$$ = '<br>';}
| SQS
{$$ = '<br>';}
| SQE
{$$ = '<br>';}
| DIAMOND_START
{$$ = '<br>';}
| DIAMOND_STOP
{$$ = '<br>';}
| TAG_START
{$$ = '<br>';}
| TAG_END
{$$ = '<br>';}
| ARROW_CROSS
{$$ = '<br>';}
| ARROW_POINT
{$$ = '<br>';}
| ARROW_CIRCLE
{$$ = '<br>';}
| ARROW_OPEN
{$$ = '<br>';}
| QUOTE
{$$ = '<br>';}
| SPACE
{$$ = $1;}
| MINUS
{$$ = $1;}
| SEMI
{$$ = $1;}
| keywords
{$$ = $1;}
;
keywords keywords
: STYLE | LINKSTYLE | CLASSDEF | CLASS | CLICK | GRAPH | DIR; : STYLE | LINKSTYLE | CLASSDEF | CLASS | CLICK | GRAPH | DIR;
@@ -366,31 +259,6 @@ textNoTags: textNoTagsToken
{$$=$1+''+$2;} {$$=$1+''+$2;}
; ;
textNoTagsToken: ALPHA
{$$=$1;}
| NUM
{$$=$1;}
| COLON
{$$ = $1;}
| COMMA
{$$ = $1;}
| PLUS
{$$ = $1;}
| EQUALS
{$$ = $1;}
| MULT
{$$ = $1;}
| DOT
{$$ = $1;}
| BRKT
{$$ = '<br>';}
| SPACE
{$$ = $1;}
| MINUS
{$$ = $1;}
| keywords
{$$ = $1;}
;
classDefStatement:CLASSDEF SPACE alphaNum SPACE stylesOpt classDefStatement:CLASSDEF SPACE alphaNum SPACE stylesOpt
{$$ = $1;yy.addClass($3,$5);} {$$ = $1;yy.addClass($3,$5);}
@@ -414,10 +282,9 @@ linkStyleStatement:
LINKSTYLE SPACE NUM SPACE stylesOpt LINKSTYLE SPACE NUM SPACE stylesOpt
{$$ = $1;yy.updateLink($3,$5);} {$$ = $1;yy.updateLink($3,$5);}
; ;
commentStatement:
PCT PCT commentText commentStatement: PCT PCT commentText;
{$$ = $1;}
;
stylesOpt: style stylesOpt: style
{$$ = [$1]} {$$ = [$1]}
| stylesOpt COMMA style | stylesOpt COMMA style
@@ -425,28 +292,21 @@ stylesOpt: style
; ;
style: styleComponent style: styleComponent
{$$=$1;}
|style styleComponent |style styleComponent
{$$ = $1 + $2;} {$$ = $1 + $2;}
; ;
styleComponent: ALPHA styleComponent: ALPHA | COLON | MINUS | NUM | UNIT | SPACE | HEX | BRKT | DOT;
{$$=$1}
| COLON /* Token lists */
{$$=$1}
| MINUS commentToken : textToken | graphCodeTokens ;
{$$=$1}
| NUM textToken : textNoTagsToken | TAGSTART | TAGEND ;
{$$=$1}
| UNIT textNoTagsToken: alphaNumToken | SPACE | MINUS | keywords ;
{$$=$1}
| SPACE alphaNumToken : ALPHA | NUM | COLON | COMMA | PLUS | EQUALS | MULT | DOT | BRKT ;
{$$=$1}
| HEX graphCodeTokens: PIPE | PS | PE | SQS | SQE | DIAMOND_START | DIAMOND_STOP | TAG_START | TAG_END | ARROW_CROSS | ARROW_POINT | ARROW_CIRCLE | ARROW_OPEN | QUOTE | SEMI ;
{$$=$1}
| BRKT
{$$=$1}
| DOT
{$$=$1}
;
%% %%

105
src/diagrams/flowchart/parser/flow.js
View File

File diff suppressed because one or more lines are too long