GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-28 07:03:17 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1287 from mermaid-js/revert-1281-feature/1249_BlockComments

Browse Source 
Revert "Multiline comments" - accidentally merged
This commit is contained in:
GDFaber 2020-02-29 21:40:55 +01:00 committed by GitHub
commit 2a55e74e11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/diagrams/class/parser/classDiagram.jison
View File

@ -9,8 +9,7 @@
%x string generic struct %x string generic struct
%% %%
\%\%[^\n]*\n* /* skip comments */ \%\%[^\n]*\n* /* do nothing */
\%\%\*((.|\n)*)\*\%\% /* multiline skip comments */
\n+ return 'NEWLINE'; \n+ return 'NEWLINE';
\s+ /* skip whitespace */ \s+ /* skip whitespace */
"classDiagram" return 'CLASS_DIAGRAM'; "classDiagram" return 'CLASS_DIAGRAM';

3
src/diagrams/flowchart/parser/flow.jison
View File

@ -10,8 +10,7 @@
%x dir %x dir
%x vertex %x vertex
%% %%
\%\%[^\n]*\n* /* skip comments */ \%\%[^\n]*\n* /* do nothing */
\%\%\*((.|\n)*)\*\%\% /* multiline skip comments */
["] this.begin("string"); ["] this.begin("string");
<string>["] this.popState(); <string>["] this.popState();
<string>[^"]* return "STR"; <string>[^"]* return "STR";

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

@ -17,7 +17,6 @@
\s+ /* skip whitespace */ \s+ /* skip whitespace */
\#[^\n]* /* skip comments */ \#[^\n]* /* skip comments */
\%%[^\n]* /* skip comments */ \%%[^\n]* /* skip comments */
\%\%\*((.|\n)*)\*\%\% /* multiline skip comments */
/* /*
---interactivity command--- ---interactivity command---

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

@ -18,7 +18,6 @@
\s+ /* skip all whitespace */ \s+ /* skip all whitespace */
\#[^\n]* /* skip comments */ \#[^\n]* /* skip comments */
\%%[^\n]* /* skip comments */ \%%[^\n]* /* skip comments */
\%\%\*((.|\n)*)\*\%\% /* multiline skip comments */
"gitGraph" return 'GG'; "gitGraph" return 'GG';
"commit" return 'COMMIT'; "commit" return 'COMMIT';
"branch" return 'BRANCH'; "branch" return 'BRANCH';

3
src/diagrams/pie/parser/pie.jison
View File

@ -12,8 +12,7 @@
%} %}
%% %%
\%\%[^\n]* /* skip comments */ \%\%[^\n]* /* do nothing */
\%\%\*((.|\n)*)\*\%\% /* multiline skip comments */
\s+ /* skip whitespace */ \s+ /* skip whitespace */
"pie" return 'pie' ; "pie" return 'pie' ;
[\s\n\r]+ return 'NL' ; [\s\n\r]+ return 'NL' ;

1
src/diagrams/sequence/parser/sequenceDiagram.jison
View File

@ -26,7 +26,6 @@
<ID,ALIAS,LINE>((?!\n)\s)+ /* skip same-line whitespace */ <ID,ALIAS,LINE>((?!\n)\s)+ /* skip same-line whitespace */
<INITIAL,ID,ALIAS,LINE>\#[^\n]* /* skip comments */ <INITIAL,ID,ALIAS,LINE>\#[^\n]* /* skip comments */
\%%[^\n]* /* skip comments */ \%%[^\n]* /* skip comments */
\%\%\*((.|\n)*)\*\%\% /* multiline skip comments */
"participant" { this.begin('ID'); return 'participant'; } "participant" { this.begin('ID'); return 'participant'; }
<ID>[^\->:\n,;]+?(?=((?!\n)\s)+"as"(?!\n)\s|[#\n;]|$) { yytext = yytext.trim(); this.begin('ALIAS'); return 'ACTOR'; } <ID>[^\->:\n,;]+?(?=((?!\n)\s)+"as"(?!\n)\s|[#\n;]|$) { yytext = yytext.trim(); this.begin('ALIAS'); return 'ACTOR'; }
<ALIAS>"as" { this.popState(); this.popState(); this.begin('LINE'); return 'AS'; } <ALIAS>"as" { this.popState(); this.popState(); this.begin('LINE'); return 'AS'; }

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

@ -33,11 +33,10 @@
%% %%
[\n]+ return 'NL'; [\n]+ return 'NL';
\s+ /* skip all whitespace */ \s+ /* skip all whitespace */
<ID,STATE,struct,LINE>((?!\n)\s)+ /* skip same-line whitespace */ <ID,STATE,struct,LINE>((?!\n)\s)+ /* skip same-line whitespace */
<INITIAL,ID,STATE,struct,LINE>\#[^\n]* /* skip comments */ <INITIAL,ID,STATE,struct,LINE>\#[^\n]* /* skip comments */
\%%[^\n]* /* skip comments */ \%%[^\n]* /* skip comments */
\%\%\*((.|\n)*)\*\%\% /* multiline skip comments */
"scale"\s+ { this.pushState('SCALE'); /* console.log('Got scale', yytext);*/ return 'scale'; } "scale"\s+ { this.pushState('SCALE'); /* console.log('Got scale', yytext);*/ return 'scale'; }
<SCALE>\d+ return 'WIDTH'; <SCALE>\d+ return 'WIDTH';