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

Replace alphanum with idString where appropriate

Browse Source
This commit is contained in:
Ibrahim Wassouf
2023-07-21 17:33:33 -03:00
parent 69c91ae5ed
commit 0d7cc748b8
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,6 +118,7 @@ that id.
[0-9]+ return 'NUM'; [0-9]+ return 'NUM';
\# return 'BRKT'; \# return 'BRKT';
\#[0-9]+ return 'HEX';
":::" return 'STYLE_SEPARATOR'; ":::" return 'STYLE_SEPARATOR';
":" return 'COLON'; ":" return 'COLON';
"&" return 'AMP'; "&" return 'AMP';
@@ -163,7 +164,7 @@ that id.
"^" return 'UP'; "^" return 'UP';
"\|" return 'SEP'; "\|" return 'SEP';
"v" return 'DOWN'; "v" return 'DOWN';
([A-Za-z0-9!"#$%&'*+\.`?\\_]|\-(?=[^\>\-\.]))+ return 'NODE_STRING'; ([A-Za-z0-9!"\#$%&'*+\.`?\\_\/]|\-(?=[^\>\-\.]))+ return 'NODE_STRING';
"-" return 'MINUS' "-" return 'MINUS'
[\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6]| [\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6]|
[\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377]| [\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377]|
@@ -477,13 +478,11 @@ textNoTags: textNoTagsToken
; ;
classDefStatement:CLASSDEF SPACE DEFAULT SPACE stylesOpt classDefStatement:CLASSDEF SPACE idString SPACE stylesOpt
{$$ = $1;yy.addClass($3,$5);} {$$ = $1;yy.addClass($3,$5);}
| CLASSDEF SPACE alphaNum SPACE stylesOpt
{$$ = $1;yy.addClass($3,$5);}
; ;
classStatement:CLASS SPACE alphaNum SPACE alphaNum classStatement:CLASS SPACE idString SPACE alphaNum
{$$ = $1;yy.setClass($3, $5);} {$$ = $1;yy.setClass($3, $5);}
; ;
@@ -504,7 +503,7 @@ clickStatement
| CLICK STR SPACE STR SPACE LINK_TARGET {$$ = $1;yy.setLink($1, $2, $6);yy.setTooltip($1, $4);} | CLICK STR SPACE STR SPACE LINK_TARGET {$$ = $1;yy.setLink($1, $2, $6);yy.setTooltip($1, $4);}
; ;
styleStatement:STYLE SPACE alphaNum SPACE stylesOpt styleStatement:STYLE SPACE idString SPACE stylesOpt
{$$ = $1;yy.addVertex($3,undefined,undefined,$5);} {$$ = $1;yy.addVertex($3,undefined,undefined,$5);}
| STYLE SPACE HEX SPACE stylesOpt | STYLE SPACE HEX SPACE stylesOpt
{$$ = $1;yy.updateLink($3,$5);} {$$ = $1;yy.updateLink($3,$5);}
@@ -545,9 +544,9 @@ style: styleComponent
styleComponent: NUM | NODE_STRING| COLON | UNIT | SPACE | HEX | BRKT | STYLE | PCT ; styleComponent: NUM | NODE_STRING| COLON | UNIT | SPACE | HEX | BRKT | STYLE | PCT ;
/* Token lists */ /* Token lists */
idStringToken : NUM | NODE_STRING | DOWN | MINUS | DEFAULT; idStringToken : NUM | NODE_STRING | DOWN | MINUS | DEFAULT | COMMA | COLON;
textToken : STR | TEXT | TAGSTART | TAGEND; textToken : STR | TEXT | TAGSTART | TAGEND | UNICODE_TEXT;
textNoTagsToken: NUM | NODE_STRING | SPACE | MINUS | keywords | START_LINK ; textNoTagsToken: NUM | NODE_STRING | SPACE | MINUS | keywords | START_LINK ;
@@ -570,8 +569,6 @@ alphaNumStatement
{$$=$1;} {$$=$1;}
| NODE_STRING | NODE_STRING
{$$=$1;} {$$=$1;}
| alphaNumToken
{$$=$1;}
| DOWN | DOWN
{$$='v';} {$$='v';}
| MINUS | MINUS