marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-11-20 04:34:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Labels for relations between classes in classdiagrams

Browse Source
This commit is contained in:
knsv
2015-11-11 13:16:38 +01:00
parent 24d1afd40f
commit ad4e0a2ad5
5 changed files with 95 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/diagrams/classDiagram/parser/classDiagram.jison
View File

@@ -138,7 +138,7 @@ className
statement
: relationStatement { yy.addRelation($1); }
| relationStatement LABEL { $1.title = $2; yy.addRelation($1); }
| relationStatement LABEL { $1.title = yy.cleanupLabel($2); yy.addRelation($1); }
| classStatement
| methodStatement
;
@@ -155,7 +155,7 @@ members
methodStatement
: className {/*console.log('Rel found',$1);*/}
| className LABEL {yy.addMembers($1,$2);}
| className LABEL {yy.addMembers($1,yy.cleanupLabel($2));}
| MEMBER {console.warn('Member',$1);}
| SEPARATOR {/*console.log('sep found',$1);*/}
;

4
src/diagrams/classDiagram/parser/classDiagram.js
View File

@@ -93,7 +93,7 @@ case 7:
yy.addRelation($$[$0]);
break;
case 8:
$$[$0-1].title = $$[$0]; yy.addRelation($$[$0-1]);
$$[$0-1].title = yy.cleanupLabel($$[$0]); yy.addRelation($$[$0-1]);
break;
case 12:
/*console.log($$[$0-3],JSON.stringify($$[$0-1]));*/yy.addMembers($$[$0-3],$$[$0-1]);
@@ -108,7 +108,7 @@ case 15:
/*console.log('Rel found',$$[$0]);*/
break;
case 16:
yy.addMembers($$[$0-1],$$[$0]);
yy.addMembers($$[$0-1],yy.cleanupLabel($$[$0]));
break;
case 17:
console.warn('Member',$$[$0]);