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

1st version parsing for class diagrams, fetching data from parsing

Browse Source
This commit is contained in:
knsv
2015-10-28 08:12:47 +01:00
parent d3a025acd6
commit a694f61003
5 changed files with 221 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,15 +137,15 @@ className
;
statement
: relationStatement
| relationStatement LABEL {/*console.log('Label found',$2);*/}
: relationStatement { yy.addRelation($1); }
| relationStatement LABEL { $1.title = $2; yy.addRelation($1); }
| classStatement
| methodStatement
;
classStatement
: CLASS className
| CLASS className STRUCT_START members STRUCT_STOP {/*console.log($2,JSON.stringify($4));*/yy.addMembers();}
| CLASS className STRUCT_START members STRUCT_STOP {/*console.log($2,JSON.stringify($4));*/yy.addMembers($2,$4);}
;
members
@@ -161,29 +161,29 @@ methodStatement
;
relationStatement
: className relation className {/*console.log('Rel found:',$1,' , ',$2,' , ',$3);*/}
| className STR relation className {/*console.log('Rel found:',$1,' , ',$2,' , ',$3);*/}
| className relation STR className {/*console.log('Rel found:',$1,' , ',$2,' , ',$3);*/}
| className STR relation STR className {/*console.log('Str rel found:',$1,' , ',$2,' , ',$3);*/}
: className relation className { $$ = {'id1':$1,'id2':$3, relation:$2, relationTitle1:'none', relationTitle2:'none'}; }
| className STR relation className { $$ = {id1:$1, id2:$4, relation:$3, relationTitle1:$2, relationTitle2:'none'}}
| className relation STR className { $$ = {id1:$1, id2:$4, relation:$2, relationTitle1:'none', relationTitle2:$3}; }
| className STR relation STR className { $$ = {id1:$1, id2:$5, relation:$3, relationTitle1:$2, relationTitle2:$4} }
;
relation
: relationType lineType relationType { $$=$1+$2+$3; }
| lineType relationType { $$=$1+$2; }
| relationType lineType { $$=$1+$2; }
| lineType { $$=$1; }
: relationType lineType relationType { $$={type1:$1,type2:$2,lineType:$3}; }
| lineType relationType { $$={type1:'none',type2:$2,lineType:$1}; }
| relationType lineType { $$={type1:$1,type2:'none',lineType:$2}; }
| lineType { $$={type1:'none',type2:'none',lineType:$1}; }
;
relationType
: AGGREGATION
| EXTENSION
| COMPOSITION
| DEPENDENCY
: AGGREGATION { $$=yy.relationType.AGGREGATION;}
| EXTENSION { $$=yy.relationType.EXTENSION;}
| COMPOSITION { $$=yy.relationType.COMPOSITION;}
| DEPENDENCY { $$=yy.relationType.DEPENDENCY;}
;
lineType
: LINE
| DOTTED_LINE
: LINE {$$=yy.lineType.LINE;}
| DOTTED_LINE {$$=yy.lineType.DOTTED_LINE;}
;
commentToken : textToken | graphCodeTokens ;

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

@@ -83,17 +83,20 @@ performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* actio
var $0 = $$.length - 1;
switch (yystate) {
case 5: case 24: case 25:
case 5:
this.$=$$[$0-1]+$$[$0];
break;
case 6: case 26:
case 6:
this.$=$$[$0];
break;
case 7:
yy.addRelation($$[$0]);
break;
case 8:
/*console.log('Label found',$$[$0]);*/
$$[$0-1].title = $$[$0]; yy.addRelation($$[$0-1]);
break;
case 12:
console.log($$[$0-3],JSON.stringify($$[$0-1]));
/*console.log($$[$0-3],JSON.stringify($$[$0-1]));*/yy.addMembers($$[$0-3],$$[$0-1]);
break;
case 13:
this.$ = [$$[$0]];
@@ -108,16 +111,46 @@ case 18:
/*console.log('sep found',$$[$0]);*/
break;
case 19:
/*console.log('Rel found:',$$[$0-2],' , ',$$[$0-1],' , ',$$[$0]);*/
this.$ = {'id1':$$[$0-2],'id2':$$[$0], relation:$$[$0-1], relationTitle1:'none', relationTitle2:'none'};
break;
case 20: case 21:
/*console.log('Rel found:',$$[$0-3],' , ',$$[$0-2],' , ',$$[$0-1]);*/
case 20:
this.$ = {id1:$$[$0-3], id2:$$[$0], relation:$$[$0-1], relationTitle1:$$[$0-2], relationTitle2:'none'}
break;
case 21:
this.$ = {id1:$$[$0-3], id2:$$[$0], relation:$$[$0-2], relationTitle1:'none', relationTitle2:$$[$0-1]};
break;
case 22:
/*console.log('Str rel found:',$$[$0-4],' , ',$$[$0-3],' , ',$$[$0-2]);*/
this.$ = {id1:$$[$0-4], id2:$$[$0], relation:$$[$0-2], relationTitle1:$$[$0-3], relationTitle2:$$[$0-1]}
break;
case 23:
this.$=$$[$0-2]+$$[$0-1]+$$[$0];
this.$={type1:$$[$0-2],type2:$$[$0-1],lineType:$$[$0]};
break;
case 24:
this.$={type1:'none',type2:$$[$0],lineType:$$[$0-1]};
break;
case 25:
this.$={type1:$$[$0-1],type2:'none',lineType:$$[$0]};
break;
case 26:
this.$={type1:'none',type2:'none',lineType:$$[$0]};
break;
case 27:
this.$=yy.relationType.AGGREGATION;
break;
case 28:
this.$=yy.relationType.EXTENSION;
break;
case 29:
this.$=yy.relationType.COMPOSITION;
break;
case 30:
this.$=yy.relationType.DEPENDENCY;
break;
case 31:
this.$=yy.lineType.LINE;
break;
case 32:
this.$=yy.lineType.DOTTED_LINE;
break;
}
},