1
=== modified file 'WorkcraftCore/src/org/workcraft/plugins/layout/DotParser.jj'
2
--- WorkcraftCore/src/org/workcraft/plugins/layout/DotParser.jj	2010-10-06 15:51:01 +0000
3
+++ WorkcraftCore/src/org/workcraft/plugins/layout/DotParser.jj	2014-06-05 15:01:31 +0000
4
@@ -46,6 +46,7 @@
5
46
  	| <NAME: (["_","A"-"Z","a"-"z","0"-"9"])+>
46
  	| <NAME: (["_","A"-"Z","a"-"z","0"-"9"])+>
6
47
  	| <INTEGER: (["0"-"9"])+>
47
  	| <INTEGER: (["0"-"9"])+>
7
48
  	| <QUOTED: "\""(~["\""] | "\\\"")*"\"" >
48
  	| <QUOTED: "\""(~["\""] | "\\\"")*"\"" >
8
49
  	| <NUMERAL: (["-"])?("."(["0"-"9"])+ | (["0"-"9"])+ ("."(["0"-"9"])*)?)>
9
49
}
50
}
10
50
51
11
51
String id() :
52
String id() :
12
52
{
53
{
13
53
 Token t;
54
 Token t;
14
54
}
55
}
15
55
{
56
{
16
@@ -56,7 +57,9 @@
17
56
  | t = "digraph"
57
  | t = "digraph"
18
57
  | t = "node"
58
  | t = "node"
19
58
  | t = "edge"
59
  | t = "edge"
20
59
  | t = < NAME >
21
60
 )
60
 )
22
61
 {
61
 {
23
62
   return t.image;
62
   return t.image;
24
63
 }
63
 }
25
64
}
64
}
26
65
  | t = < NAME >
27
66
  | t = < NUMERAL >
28
65
 )
67
 )
29
66
 {
68
 {
30
67
   return t.image;
69
   return t.image;
31
68
 }
70
 }
32
71
}
33
69
72
34
70
void graph(DotListener listener) :
73
void graph(DotListener listener) :
35
71
{
74
{
36
72
}
75
}
37
@@ -102,4 +105,4 @@
38
102
{
105
{
39
103
	("graph"|"node"|"edge") attr_list()
106
	("graph"|"node"|"edge") attr_list()
40
104
}
107
}
41
105
108
42
106
void statement(DotListener listener) :
43
107
{
109
{
44
108
 Token name;
110
 Token name;
45
109
 Map < String, String > prop;
111
 Map < String, String > prop;
46
110
 String i, j;
112
 String i, j;
47
111
}
113
}
48
112
{
114
{
49
113
 (
115
 (
50
114
   attr_statement()
116
   attr_statement()
51
115
 | i = id()
117
 | i = id()
52
116
   (
118
   (
53
117
     prop = attr_list()
119
     prop = attr_list()
54
118
     {
120
     {
55
119
       listener.node(i, prop);
121
       listener.node(i, prop);
56
120
     }
122
     }
57
121
   | "->" j = id() prop = attr_list()
123
   | "->" j = id() prop = attr_list()
58
122
     {
124
     {
59
123
       listener.arc(i, j, prop);
125
       listener.arc(i, j, prop);
60
124
     }
126
     }
61
125
   )
127
   )
62
126
 )
128
 )
63
127
 ";"
129
 ";"
64
128
}
130
}
65
129
\ No newline at end of file
131
\ No newline at end of file
66
132
void statement(DotListener listener) :
67
130
{
133
{
68
131
 Token name;
134
 Token name;
69
132
 Map < String, String > prop;
135
 Map < String, String > prop;
70
133
 String i, j;
136
 String i, j;
71
134
}
137
}
72
135
{
138
{
73
136
 (
139
 (
74
137
   attr_statement()
140
   attr_statement()
75
138
 	| i = id()
141
 	| i = id()
76
139
   (
142
   (
77
140
     prop = attr_list()
143
     prop = attr_list()
78
141
     {
144
     {
79
142
       listener.node(i, prop);
145
       listener.node(i, prop);
80
143
     }
146
     }
81
144
   | "->" j = id() prop = attr_list()
147
   | "->" j = id() prop = attr_list()
82
145
     {
148
     {
83
146
       listener.arc(i, j, prop);
149
       listener.arc(i, j, prop);
84
147
     }
150
     }
85
148
   )
151
   )
86
149
 )
152
 )
87
150
 ";"
153
 ";"
88
151
}
154
}
89
152
\ No newline at end of file
155
\ No newline at end of file
Status:	Merged
Merged at revision:	507
Proposed branch:	lp:~danilovesky/workcraft/trunk-bug-1326800
Merge into:	lp:workcraft
Diff against target:	30 lines (+1/-0) 1 file modified WorkcraftCore/src/org/workcraft/plugins/layout/DotParser.jj (+1/-0)
To merge this branch:	bzr merge lp:~danilovesky/workcraft/trunk-bug-1326800
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Danil Sokolov			Approve on 2014-06-05
Review via email: mp+222210@code.launchpad.net