Skip to content

Commit 23981fc

Browse files
committed
Simplify the grammar of the ROS model DSL
1 parent 00f72d4 commit 23981fc

File tree

13 files changed

+34865
-19448
lines changed

13 files changed

+34865
-19448
lines changed

plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/RosParser.java

Lines changed: 121 additions & 54 deletions
Large diffs are not rendered by default.

plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalRos.g

Lines changed: 4152 additions & 1320 deletions
Large diffs are not rendered by default.

plugins/de.fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalRos.tokens

Lines changed: 86 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,99 @@
11
','=44
2-
'ActionClient'=70
3-
'ActionServer'=69
4-
'ActionSpec'=55
5-
'Array'=85
6-
'Artifact'=48
7-
'Base64'=84
8-
'Boolean'=83
9-
'CatkinPackage'=49
10-
'Double'=82
11-
'ExternalDependency'=72
12-
'GlobalNamespace'=73
2+
'ActionClient'=79
3+
'ActionClients'=70
4+
'ActionServer'=78
5+
'ActionServers'=68
6+
'ActionSpec'=57
7+
'Array'=94
8+
'Artifact'=49
9+
'Base64'=93
10+
'Boolean'=92
11+
'CatkinPackage'=50
12+
'Dependencies'=52
13+
'Double'=91
14+
'ExternalDependency'=81
15+
'GlobalNamespace'=82
1316
'GraphName'=25
1417
'Header'=27
15-
'Integer'=80
16-
'List'=78
17-
'Node'=56
18+
'Integer'=89
19+
'List'=87
20+
'Node'=58
1821
'Package'=45
19-
'PackageDependency'=71
22+
'PackageDependency'=80
2023
'PackageSet'=40
21-
'Parameter'=77
22-
'ParameterAny'=86
23-
'ParameterStructMember'=87
24-
'PrivateNamespace'=76
25-
'Publisher'=66
26-
'RelativeNamespace'=75
27-
'ServiceClient'=68
28-
'ServiceServer'=64
29-
'ServiceSpec'=51
24+
'Parameter'=86
25+
'ParameterAny'=95
26+
'ParameterStructMember'=96
27+
'Parameters'=72
28+
'PrivateNamespace'=85
29+
'Publisher'=75
30+
'Publishers'=62
31+
'RelativeNamespace'=84
32+
'ServiceClient'=77
33+
'ServiceClients'=66
34+
'ServiceServer'=73
35+
'ServiceServers'=60
36+
'ServiceSpec'=53
37+
'Specs'=47
3038
'String'=28
31-
'Struc'=79
32-
'Subscriber'=67
33-
'TopicSpec'=54
34-
'[]'=114
39+
'Struc'=88
40+
'Subscriber'=76
41+
'Subscribers'=64
42+
'TopicSpec'=56
43+
'[]'=123
3544
'action'=37
36-
'actionclient'=62
37-
'actionserver'=61
38-
'artifact'=47
39-
'bool'=88
40-
'bool[]'=101
41-
'byte'=100
42-
'byte[]'=113
43-
'default'=81
44-
'dependency'=50
45+
'actionclient'=69
46+
'actionserver'=67
47+
'artifact'=48
48+
'bool'=97
49+
'bool[]'=110
50+
'byte'=109
51+
'byte[]'=122
52+
'default'=90
53+
'dependency'=51
4554
'duration'=38
4655
'feedback'=32
47-
'float32'=97
48-
'float32[]'=110
49-
'float64'=98
50-
'float64[]'=111
56+
'float32'=106
57+
'float32[]'=119
58+
'float64'=107
59+
'float64[]'=120
5160
'goal'=29
52-
'int16'=91
53-
'int16[]'=104
54-
'int32'=93
55-
'int32[]'=106
56-
'int64'=95
57-
'int64[]'=108
58-
'int8'=89
59-
'int8[]'=102
61+
'int16'=100
62+
'int16[]'=113
63+
'int32'=102
64+
'int32[]'=115
65+
'int64'=104
66+
'int64[]'=117
67+
'int8'=98
68+
'int8[]'=111
6069
'message'=30
6170
'name'=33
62-
'namespace'=65
71+
'namespace'=74
6372
'node'=26
6473
'package'=43
65-
'parameter'=63
66-
'parts'=74
67-
'publisher'=58
68-
'request'=52
69-
'response'=53
74+
'parameter'=71
75+
'parts'=83
76+
'publisher'=61
77+
'request'=54
78+
'response'=55
7079
'result'=31
7180
'service'=35
72-
'serviceclient'=60
73-
'serviceserver'=57
81+
'serviceclient'=65
82+
'serviceserver'=59
7483
'spec'=46
75-
'string'=99
76-
'string[]'=112
77-
'subscriber'=59
84+
'string'=108
85+
'string[]'=121
86+
'subscriber'=63
7887
'time'=39
7988
'type'=36
80-
'uint16'=92
81-
'uint16[]'=105
82-
'uint32'=94
83-
'uint32[]'=107
84-
'uint64'=96
85-
'uint64[]'=109
86-
'uint8'=90
87-
'uint8[]'=103
89+
'uint16'=101
90+
'uint16[]'=114
91+
'uint32'=103
92+
'uint32[]'=116
93+
'uint64'=105
94+
'uint64[]'=118
95+
'uint8'=99
96+
'uint8[]'=112
8897
'value'=34
8998
'{'=41
9099
'}'=42
@@ -124,6 +133,15 @@ T__111=111
124133
T__112=112
125134
T__113=113
126135
T__114=114
136+
T__115=115
137+
T__116=116
138+
T__117=117
139+
T__118=118
140+
T__119=119
141+
T__120=120
142+
T__121=121
143+
T__122=122
144+
T__123=123
127145
T__25=25
128146
T__26=26
129147
T__27=27

0 commit comments

Comments
 (0)