marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-10-02 21:59:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor token precedence that concern vertex text states

Browse Source
This commit is contained in:
Ibrahim Wassouf
2023-07-23 21:25:19 -03:00
parent fd88b424b4
commit 4b9773a272
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/mermaid/src/diagrams/flowchart/parser/flow.jison
View File

@@ -142,29 +142,31 @@ that id.
<*>\s*\~\~[\~]+\s* return 'LINK'; <*>\s*\~\~[\~]+\s* return 'LINK';
<*>"(-" { this.pushState("ellipseText"); return '(-'; }
<ellipseText>[-/\)][\)] { this.popState(); return '-)'; } <ellipseText>[-/\)][\)] { this.popState(); return '-)'; }
<ellipseText>[^/)]|-/!\)+ return "TEXT" <ellipseText>[^/)]|-/!\)+ return "TEXT"
<*>"(-" { this.pushState("ellipseText"); return '(-'; }
"([" { this.pushState("text"); return 'STADIUMSTART'; }
<text>"])" { this.popState(); return 'STADIUMEND'; } <text>"])" { this.popState(); return 'STADIUMEND'; }
<*>"([" { this.pushState("text"); return 'STADIUMSTART'; }
"[[" { this.pushState("text"); return 'SUBROUTINESTART'; }
<text>"]]" { this.popState(); return 'SUBROUTINEEND'; } <text>"]]" { this.popState(); return 'SUBROUTINEEND'; }
<*>"[[" { this.pushState("text"); return 'SUBROUTINESTART'; }
"[|" { return 'VERTEX_WITH_PROPS_START'; } "[|" { return 'VERTEX_WITH_PROPS_START'; }
\>/!\s { this.pushState("text"); return 'TAGEND'; } \>/!\s { this.pushState("text"); return 'TAGEND'; }
<*>"[(" { this.pushState("text") ;return 'CYLINDERSTART'; }
<text>")]" { this.popState(); return 'CYLINDEREND'; } <text>")]" { this.popState(); return 'CYLINDEREND'; }
<*>"[(" { this.pushState("text") ;return 'CYLINDERSTART'; }
<*>"(((" { this.pushState("text"); return 'DOUBLECIRCLESTART'; }
<text>")))" { this.popState(); return 'DOUBLECIRCLEEND'; } <text>")))" { this.popState(); return 'DOUBLECIRCLEEND'; }
<*>"(((" { this.pushState("text"); return 'DOUBLECIRCLESTART'; }
<*>"[/" { this.pushState("trapText"); return 'TRAPSTART'; }
<trapText>[\\(?=\])][\]] { this.popState(); return 'TRAPEND'; } <trapText>[\\(?=\])][\]] { this.popState(); return 'TRAPEND'; }
<trapText>\/(?=\])\] { this.popState(); return 'INVTRAPEND'; } <trapText>\/(?=\])\] { this.popState(); return 'INVTRAPEND'; }
<trapText>\/(?!\])|\\(?!\])|[^\\\]\/]+ return 'TEXT'; <trapText>\/(?!\])|\\(?!\])|[^\\\]\/]+ return 'TEXT';
<*>"[/" { this.pushState("trapText"); return 'TRAPSTART'; }
<*>"[\\" { this.pushState("trapText"); return 'INVTRAPSTART'; } <*>"[\\" { this.pushState("trapText"); return 'INVTRAPSTART'; }
@@ -240,13 +242,16 @@ that id.
<text>"|" { this.popState(); return 'PIPE'; } <text>"|" { this.popState(); return 'PIPE'; }
<*>"|" { this.pushState("text"); return 'PIPE'; } <*>"|" { this.pushState("text"); return 'PIPE'; }
<*>"(" { this.pushState("text"); return 'PS'; }
<text>")" { this.popState(); return 'PE'; } <text>")" { this.popState(); return 'PE'; }
<*>"(" { this.pushState("text"); return 'PS'; }
<text>"]" { this.popState(); return 'SQE'; }
<*>"[" { this.pushState("text"); return 'SQS'; } <*>"[" { this.pushState("text"); return 'SQS'; }
<text>(\]) { this.popState(); return 'SQE'; }
<*>"{" { this.pushState("text"); return 'DIAMOND_START' }
<text>(\}) { this.popState(); return 'DIAMOND_STOP' } <text>(\}) { this.popState(); return 'DIAMOND_STOP' }
<text>[^\]\)\}\|]+ return "TEXT"; <*>"{" { this.pushState("text"); return 'DIAMOND_START' }
<text>[^\]\)\}\|\"]+ return "TEXT";
"\"" return 'QUOTE'; "\"" return 'QUOTE';
(\r?\n)+ return 'NEWLINE'; (\r?\n)+ return 'NEWLINE';