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

Add support for Generic class definitions

Browse Source 
Added support in parser to translate characters surrounded by `~` into generic type definition ie: `Class01~T~` would turn into `Class01<T>`
This commit is contained in:
Justin Greywolf
2019-12-05 12:55:46 -08:00
parent 91d986970b
commit 2a41280076
6 changed files with 161 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/diagrams/class/parser/classDiagram.jison
View File

@@ -6,7 +6,7 @@
/* lexical grammar */
%lex
%x string struct
%x string generic struct
%%
\%\%[^\n]*\n* /* do nothing */
@@ -23,6 +23,9 @@
"class" return 'CLASS';
"<<" return 'ANNOTATION_START';
">>" return 'ANNOTATION_END';
[~] this.begin("generic");
<generic>[~] this.popState();
<generic>[^~]* return "GENERICTYPE";
["] this.begin("string");
<string>["] this.popState();
<string>[^"]* return "STR";
@@ -36,7 +39,7 @@
\s*o return 'AGGREGATION';
\-\- return 'LINE';
\.\. return 'DOTTED_LINE';
":"[^\n;]+ return 'LABEL';
":"[^\n;]+ return 'LABEL';
\- return 'MINUS';
"." return 'DOT';
\+ return 'PLUS';
@@ -136,6 +139,8 @@ statements
className
: alphaNumToken className { $$=$1+$2; }
| alphaNumToken { $$=$1; }
| alphaNumToken GENERICTYPE className { $$=$1+'~'+$2+$3; }
| alphaNumToken GENERICTYPE { $$=$1+'~'+$2; }
;
statement