marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-10-21 06:59:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed STR as it is no longer required; made 'click' a state such that it returns the id that is specified after the keyword

Browse Source
This commit is contained in:
abzicht
2019-03-09 22:18:37 +01:00
parent 4587f5a73d
commit 856591d253
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/diagrams/gantt/parser/gantt.jison
View File

@@ -10,9 +10,7 @@
/* string is used to detect blocks that are surrounded by double quotes. */ /* string is used to detect blocks that are surrounded by double quotes. */
/* copied from /src/diagrams/flowchart/parser/flow.jison */ /* copied from /src/diagrams/flowchart/parser/flow.jison */
%x string %x string
/* a valid callback looks like this: callback(example_callback_arg) */ %x click
/* callback prefix: callback( */
/* callback suffix: ) */
%x href %x href
%x callbackname %x callbackname
%x callbackargs %x callbackargs
@@ -22,29 +20,28 @@
\s+ /* skip whitespace */ \s+ /* skip whitespace */
\#[^\n]* /* skip comments */ \#[^\n]* /* skip comments */
\%%[^\n]* /* skip comments */ \%%[^\n]* /* skip comments */
/* Strings are used to detect tooltips */
["] this.begin("string");
<string>["] this.popState();
<string>[^"]* return 'STR';
"href"\s+ this.begin("href"); "href"[\s]+ this.begin("href"); /* return the next word after 'href' */
<href>[\s\n] this.popState(); <href>[\s\n] this.popState(); /* e.g. return https://example.com for 'href https://example.com' */
<href>[^\s\n]* return 'href'; <href>[^\s\n]* return 'href'; /* the specified word must not contain whitespace */
"call"\s+ this.begin("callbackname"); "call" this.begin("callbackname");
<callbackname>\( this.popState(); this.begin("callbackargs"); <callbackname>\( this.popState(); this.begin("callbackargs");
<callbackname>[^(]* return 'callbackname'; <callbackname>[^(]* return 'callbackname';
<callbackargs>\) this.popState(); <callbackargs>\) this.popState();
<callbackargs>[^)]* return 'callbackargs'; <callbackargs>[^)]* return 'callbackargs';
"click" return 'click'; "click"[\s]+ this.begin("click");
<click>[\s\n] this.popState();
<click>[^\s\n]* return 'click';
"gantt" return 'gantt'; "gantt" return 'gantt';
"dateFormat"\s[^#\n;]+ return 'dateFormat'; "dateFormat"\s[^#\n;]+ return 'dateFormat';
"axisFormat"\s[^#\n;]+ return 'axisFormat'; "axisFormat"\s[^#\n;]+ return 'axisFormat';
\d\d\d\d"-"\d\d"-"\d\d return 'date'; \d\d\d\d"-"\d\d"-"\d\d return 'date';
"title"\s[^#\n;]+ return 'title'; "title"\s[^#\n;]+ return 'title';
"section"\s[^#:\n;]+ return 'section'; "section"\s[^#:\n;]+ return 'section';
[^#:()\n;]+ return 'taskTxt'; [^#:()\n;]+ return 'taskTxt';
":"[^#\n;]+ return 'taskData'; ":"[^#\n;]+ return 'taskData';
":" return ':'; ":" return ':';
<<EOF>> return 'EOF'; <<EOF>> return 'EOF';
@@ -84,17 +81,16 @@ statement
; ;
clickStatement clickStatement
: click STR callbackname callbackargs {$$ = $1;yy.setClickEvent($2, $3, $4);} : click callbackname callbackargs {$$ = $1;yy.setClickEvent($1, $2, $3);}
| click STR callbackname callbackargs href {$$ = $1;yy.setClickEvent($2, $3, $4);yy.setLink($2,$5);} | click callbackname callbackargs href {$$ = $1;yy.setClickEvent($1, $2, $3);yy.setLink($1,$4);}
| click STR href callbackname callbackargs {$$ = $1;yy.setClickEvent($2, $4, $5);yy.setLink($2,$3);} | click href callbackname callbackargs {$$ = $1;yy.setClickEvent($1, $3, $4);yy.setLink($1,$2);}
| click STR href {$$ = $1;yy.setLink($2, $3);} | click href {$$ = $1;yy.setLink($1, $2);}
; ;
clickStatementDebug clickStatementDebug
: click STR callbackname callbackargs {$$=$1+' ' + $2 + ' ' + $3 + ' ' + $4;} : click callbackname callbackargs {$$=$1+' ' + $2 + ' ' + $3;}
| click STR callbackname callbackargs href {$$=$1+' ' + $2 + ' ' + $3 + ' ' + $4 + ' ' + $5;} | click callbackname callbackargs href {$$=$1+' ' + $2 + ' ' + $3 + ' ' + $4;}
| click STR href callbackname callbackargs {$$=$1+' ' + $2 + ' ' + $3 + ' ' + $4 + ' ' + $5;} | click href callbackname callbackargs {$$=$1+' ' + $2 + ' ' + $3 + ' ' + $4;}
| click STR href {$$=$1+' ' + $2 + ' ' + $3;} | click href {$$=$1+' ' + $2;}
; ;
%% %%