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

Fixes

Browse Source 
GraphObjects.md: [ and ] should be escaped in text (they're links otherwise)
flow.jison: fixed a parsing issue when the direction is omitted (defaults to 'TB')
stateRenderer-v2: was silently failing due to a try/catch in the parse function. (intentional?) removed to show errorHandler
mermaidAPI: removed unnecessary call to updateRendererConfigs since reinitialize does this
This commit is contained in:
chris moran
2020-07-28 04:44:38 -04:00
parent 0299ff0a79
commit 283faf7a2f
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,10 +6,15 @@
/* lexical grammar */
%lex
%options case-insensitive
%x string
%x dir
%x vertex
%x open_directive type_directive arg_directive
%x open_directive
%x type_directive
%x arg_directive
%x close_directive
%%
\%\%\{ { this.begin('open_directive'); return 'open_directive'; }
@@ -33,6 +38,7 @@
"flowchart" {if(yy.lex.firstGraph()){this.begin("dir");} return 'GRAPH';}
"subgraph" return 'subgraph';
"end"\b\s* return 'end';
<dir>[^\n\s]* { this.popState(); }
<dir>\s*"LR" { this.popState(); return 'DIR'; }
<dir>\s*"RL" { this.popState(); return 'DIR'; }
<dir>\s*"TB" { this.popState(); return 'DIR'; }
@@ -187,7 +193,7 @@
"{" return 'DIAMOND_START'
"}" return 'DIAMOND_STOP'
"\"" return 'QUOTE';
(\r|\n|\r\n)+ return 'NEWLINE';
(\r?\n)+ return 'NEWLINE';
\s return 'SPACE';
<<EOF>> return 'EOF';
@@ -233,8 +239,10 @@ directive
graphConfig
: SPACE graphConfig
| NEWLINE graphConfig
| GRAPH FirstStmtSeperator
{ console.log('GRAPH FirstStmtSeperator');yy.setDirection('TB');$$ = 'TB';}
| GRAPH DIR FirstStmtSeperator
{ yy.setDirection($2);$$ = $2;}
{ console.log('GRAPH DIR FirstStmtSeperator');yy.setDirection($2);$$ = $2;}
// | GRAPH SPACE TAGEND FirstStmtSeperator
// { yy.setDirection("LR");$$ = $3;}
// | GRAPH SPACE TAGSTART FirstStmtSeperator