From 90c17a0f5edce3963f1f0581189b04a1c7ccb58c Mon Sep 17 00:00:00 2001 From: futzmonitor Date: Wed, 31 Jan 2024 23:11:56 -0500 Subject: [PATCH] Revert "Changes to flow.jison" This reverts commit 28b9dc897fa6756fc5bf423381c3df35c637fbfc. --- packages/mermaid/src/diagrams/flowchart/parser/flow.jison | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/mermaid/src/diagrams/flowchart/parser/flow.jison b/packages/mermaid/src/diagrams/flowchart/parser/flow.jison index c2835869be..de23d93cb9 100644 --- a/packages/mermaid/src/diagrams/flowchart/parser/flow.jison +++ b/packages/mermaid/src/diagrams/flowchart/parser/flow.jison @@ -114,7 +114,6 @@ that id. ":::" return 'STYLE_SEPARATOR'; ":" return 'COLON'; "&" return 'AMP'; -"+" return 'PLUS'; ";" return 'SEMI'; "," return 'COMMA'; "*" return 'MULT'; @@ -170,7 +169,6 @@ that id. "*" return 'MULT'; "#" return 'BRKT'; "&" return 'AMP'; -"+" return 'PLUS'; ([A-Za-z0-9!"\#$%&'*+\.`?\\_\/]|\-(?=[^\>\-\.])|=(?!=))+ return 'NODE_STRING'; "-" return 'MINUS' [\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6]| @@ -540,15 +538,15 @@ style: styleComponent styleComponent: NUM | NODE_STRING| COLON | UNIT | SPACE | BRKT | STYLE | PCT ; /* Token lists */ -idStringToken : NUM | NODE_STRING | DOWN | MINUS | DEFAULT | COMMA | COLON | AMP | PLUS | BRKT | MULT | UNICODE_TEXT; +idStringToken : NUM | NODE_STRING | DOWN | MINUS | DEFAULT | COMMA | COLON | AMP | BRKT | MULT | UNICODE_TEXT; textToken : TEXT | TAGSTART | TAGEND | UNICODE_TEXT; -textNoTagsToken: NUM | NODE_STRING | SPACE | MINUS | AMP | PLUS | UNICODE_TEXT | COLON | MULT | BRKT | keywords | START_LINK ; +textNoTagsToken: NUM | NODE_STRING | SPACE | MINUS | AMP | UNICODE_TEXT | COLON | MULT | BRKT | keywords | START_LINK ; edgeTextToken : EDGE_TEXT | UNICODE_TEXT ; -alphaNumToken : NUM | UNICODE_TEXT | NODE_STRING | DIR | DOWN | MINUS | COMMA | COLON | AMP | PLUS | BRKT | MULT; +alphaNumToken : NUM | UNICODE_TEXT | NODE_STRING | DIR | DOWN | MINUS | COMMA | COLON | AMP | BRKT | MULT; idString :idStringToken