mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

#945 Handling recursive state statements

This commit is contained in:
knsv 2019-09-21 08:54:18 -07:00
parent 6f054519e7
commit 9993b90a20
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/diagrams/state/parser/stateDiagram.jison
View File

@ -34,7 +34,7 @@
<SCALE>\d+ return 'WIDTH';
<SCALE>\s+"width" {this.popState();}
"state"\s+ { this.pushState('STATE'); }
<INITIAL,struct>"state"\s+ { this.pushState('STATE'); }
<STATE>[^\n\s\{]+ {console.log('COMPOSIT_STATE', yytext);return 'COMPOSIT_STATE';}
<STATE>\{ {this.popState();this.pushState('struct'); console.log('begin struct', yytext);return 'STRUCT_START';}
<struct>\} { console.log('Ending struct'); this.popState(); return 'STRUCT_STOP';}}

8
src/diagrams/state/stateDiagram.spec.js
View File

@ -80,7 +80,7 @@ describe('state diagram, ', function() {
parser.parse(str);
});
xit('should handle relation definitions', function() {
it('should handle recursive state definitions', function() {
const str = `stateDiagram\n
state Configuring {
[*] --> NewValueSelection
@ -89,14 +89,14 @@ describe('state diagram, ', function() {
NewValuePreview --> NewValueSelection : EvNewValueSaved
state NewValuePreview {
State1 -> State2
State1 --> State2
}
}
`;
parser.parse(str);
});
xit('should handle relation definitions', function() {
it('should handle multiple recursive state definitions', function() {
const str = `stateDiagram\n
scale 350 width
[*] --> NotShooting
@ -114,7 +114,7 @@ describe('state diagram, ', function() {
NewValuePreview --> NewValueSelection : EvNewValueSaved
state NewValuePreview {
State1 -> State2
State1 --> State2
}
}
`;