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

Clean up gitg=Graph JISON

Browse Source
This commit is contained in:
Ashish Jain
2022-02-24 19:55:16 +01:00
parent c0cb05b406
commit bc9ff496f2
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/diagrams/git/parser/gitGraph.jison
View File

@@ -27,7 +27,7 @@
"tag:" return 'COMMIT_TAG'; "tag:" return 'COMMIT_TAG';
"branch" return 'BRANCH'; "branch" return 'BRANCH';
"merge" return 'MERGE'; "merge" return 'MERGE';
"reset" return 'RESET'; // "reset" return 'RESET';
"checkout" return 'CHECKOUT'; "checkout" return 'CHECKOUT';
"LR" return 'DIR'; "LR" return 'DIR';
"BT" return 'DIR'; "BT" return 'DIR';
@@ -79,7 +79,7 @@ statement
| BRANCH ID {yy.branch($2)} | BRANCH ID {yy.branch($2)}
| CHECKOUT ID {yy.checkout($2)} | CHECKOUT ID {yy.checkout($2)}
| MERGE ID {yy.merge($2)} | MERGE ID {yy.merge($2)}
| RESET reset_arg {yy.reset($2)} // | RESET reset_arg {yy.reset($2)}
; ;
commitStatement commitStatement
: COMMIT commit_arg {yy.commit($2)} : COMMIT commit_arg {yy.commit($2)}
@@ -102,11 +102,11 @@ commitType
| REVERSE { $$=yy.commitType.REVERSE;} | REVERSE { $$=yy.commitType.REVERSE;}
| HIGHLIGHT { $$=yy.commitType.HIGHLIGHT;} | HIGHLIGHT { $$=yy.commitType.HIGHLIGHT;}
; ;
reset_arg // reset_arg
: 'HEAD' reset_parents{$$ = $1+ ":" + $2 } // : 'HEAD' reset_parents{$$ = $1+ ":" + $2 }
| ID reset_parents{$$ = $1+ ":" + yy.count; yy.count = 0} // | ID reset_parents{$$ = $1+ ":" + yy.count; yy.count = 0}
; // ;
reset_parents // reset_parents
: /* empty */ {yy.count = 0} // : /* empty */ {yy.count = 0}
| CARET reset_parents { yy.count += 1 } // | CARET reset_parents { yy.count += 1 }
; // ;