marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-16 13:59:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for issue #170

Browse Source
This commit is contained in:
knsv
2015-06-14 09:33:48 +02:00
parent e5c16fd960
commit efb4e464b2
3 changed files with 114 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,10 +6,13 @@
/* lexical grammar */ /* lexical grammar */
%lex %lex
%x string
%% %%
\%\%[^\n]* /* do nothing */ \%\%[^\n]* /* do nothing */
\"[^\n]*\" return TESTSTR; ["] this.begin("string");
<string>["] this.popState();
<string>[^"]* return "STR";
"style" return 'STYLE'; "style" return 'STYLE';
"default" return 'DEFAULT'; "default" return 'DEFAULT';
"linkStyle" return 'LINKSTYLE'; "linkStyle" return 'LINKSTYLE';
@@ -347,7 +350,7 @@ text: textToken
{$$=$1;} {$$=$1;}
| text textToken | text textToken
{$$=$1+''+$2;} {$$=$1+''+$2;}
| TESTSTR | STR
{$$=$1;} {$$=$1;}
; ;

202
src/diagrams/flowchart/parser/flow.js
View File

File diff suppressed because one or more lines are too long

10
src/diagrams/flowchart/parser/flow.spec.js
View File

@@ -5,7 +5,7 @@
var graph = require('../graphDb'); var graph = require('../graphDb');
var flow = require('./flow'); var flow = require('./flow');
describe('when parsing ',function(){ ddescribe('when parsing ',function(){
beforeEach(function(){ beforeEach(function(){
flow.parser.yy = require('../graphDb'); flow.parser.yy = require('../graphDb');
flow.parser.yy.clear(); flow.parser.yy.clear();
@@ -561,10 +561,10 @@ describe('when parsing ',function(){
expect(vert['a'].text).toBe('v'); expect(vert['a'].text).toBe('v');
}); });
it('should handle quoted text',function(){ it('should handle quoted text',function(){
var res = flow.parser.parse('graph TD;V-- "test string" -->a[v]'); var res = flow.parser.parse('graph TD;V-- "test string()" -->a[v]');
var vert = flow.parser.yy.getVertices(); var vert = flow.parser.yy.getVertices();
var edges = flow.parser.yy.getEdges(); var edges = flow.parser.yy.getEdges();
expect(edges[0].text).toBe('test string'); expect(edges[0].text).toBe('test string()');
}); });
}); });
@@ -799,13 +799,13 @@ describe('when parsing ',function(){
}); });
it('should handle quoted text in vertices ',function(){ it('should handle quoted text in vertices ',function(){
var res = flow.parser.parse('graph TD;A["chimpansen hoppar"] --> C;'); var res = flow.parser.parse('graph TD;A["chimpansen hoppar ()[]"] --> C;');
var vert = flow.parser.yy.getVertices(); var vert = flow.parser.yy.getVertices();
var edges = flow.parser.yy.getEdges(); var edges = flow.parser.yy.getEdges();
expect(vert['A'].type).toBe('square'); expect(vert['A'].type).toBe('square');
expect(vert['A'].text).toBe('chimpansen hoppar'); expect(vert['A'].text).toBe('chimpansen hoppar ()[]');
}); });
it('should handle text in circle vertices with space',function(){ it('should handle text in circle vertices with space',function(){
var res = flow.parser.parse('graph TD;A((chimpansen hoppar))-->C;'); var res = flow.parser.parse('graph TD;A((chimpansen hoppar))-->C;');