Skip to content

Commit cbbe20b

Browse files
ipa-nhgipa-nhg
authored
Merge pull request #123 from ipa-nhg/SimplifyDSLs_def
Long term version of the new ROS model grammar
2 parents f52c4f2 + 631551b commit cbbe20b

File tree

61 files changed

+34897
-33797
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+34897
-33797
lines changed

‎docu/Parameters.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The definition of a parameter at ROS model level means that the ROS original nod
1919

2020
For the complete definition of parameters the user has to open the ROS model editor, where the language format is the following:
2121

22-
**Parameter** {**name** NAMEforPARAMETER **type** TYPEfromTHElistABOVE {**default** DEFAULTVALUE}}
22+
**Parameter** {**name** NAMEforPARAMETER **type** TYPEfromTHElistABOVE **default** DEFAULTVALUE}
2323

2424
This format is also valid for a ROSsystem file, case of ROS where a new parameter is created within a launch file.
2525

‎plugins/de.fraunhofer.ipa.componentInterface.xtext.ide/src-gen/de/fraunhofer/ipa/componentInterface/ide/contentassist/antlr/ComponentInterfaceParser.java‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
3636
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup(), "rule__ComponentInterface__Group__0");
3737
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_4(), "rule__ComponentInterface__Group_4__0");
3838
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_5(), "rule__ComponentInterface__Group_5__0");
39-
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6(), "rule__ComponentInterface__Group_6__0");
39+
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_0(), "rule__ComponentInterface__Group_6_0__0");
40+
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_0_3(), "rule__ComponentInterface__Group_6_0_3__0");
41+
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_1(), "rule__ComponentInterface__Group_6_1__0");
42+
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_1_3(), "rule__ComponentInterface__Group_6_1_3__0");
43+
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_2(), "rule__ComponentInterface__Group_6_2__0");
44+
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_2_3(), "rule__ComponentInterface__Group_6_2_3__0");
4045
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_3(), "rule__ComponentInterface__Group_6_3__0");
41-
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_7(), "rule__ComponentInterface__Group_7__0");
42-
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_7_3(), "rule__ComponentInterface__Group_7_3__0");
43-
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_8(), "rule__ComponentInterface__Group_8__0");
44-
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_8_3(), "rule__ComponentInterface__Group_8_3__0");
45-
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_9(), "rule__ComponentInterface__Group_9__0");
46-
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_9_3(), "rule__ComponentInterface__Group_9_3__0");
47-
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_10(), "rule__ComponentInterface__Group_10__0");
48-
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_10_3(), "rule__ComponentInterface__Group_10_3__0");
49-
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_11(), "rule__ComponentInterface__Group_11__0");
50-
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_11_3(), "rule__ComponentInterface__Group_11_3__0");
51-
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_12(), "rule__ComponentInterface__Group_12__0");
52-
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_12_3(), "rule__ComponentInterface__Group_12_3__0");
46+
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_3_3(), "rule__ComponentInterface__Group_6_3_3__0");
47+
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_4(), "rule__ComponentInterface__Group_6_4__0");
48+
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_4_3(), "rule__ComponentInterface__Group_6_4_3__0");
49+
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_5(), "rule__ComponentInterface__Group_6_5__0");
50+
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_5_3(), "rule__ComponentInterface__Group_6_5_3__0");
51+
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_6(), "rule__ComponentInterface__Group_6_6__0");
52+
builder.put(grammarAccess.getComponentInterfaceAccess().getGroup_6_6_3(), "rule__ComponentInterface__Group_6_6_3__0");
5353
builder.put(grammarAccess.getRosPublisherAccess().getGroup(), "rule__RosPublisher__Group__0");
5454
builder.put(grammarAccess.getRosPublisherAccess().getGroup_4(), "rule__RosPublisher__Group_4__0");
5555
builder.put(grammarAccess.getRosSubscriberAccess().getGroup(), "rule__RosSubscriber__Group__0");
@@ -76,20 +76,20 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
7676
builder.put(grammarAccess.getComponentInterfaceAccess().getNameAssignment_3(), "rule__ComponentInterface__NameAssignment_3");
7777
builder.put(grammarAccess.getComponentInterfaceAccess().getNameSpaceAssignment_4_1(), "rule__ComponentInterface__NameSpaceAssignment_4_1");
7878
builder.put(grammarAccess.getComponentInterfaceAccess().getFromRosNodeAssignment_5_1(), "rule__ComponentInterface__FromRosNodeAssignment_5_1");
79-
builder.put(grammarAccess.getComponentInterfaceAccess().getRospublisherAssignment_6_2(), "rule__ComponentInterface__RospublisherAssignment_6_2");
80-
builder.put(grammarAccess.getComponentInterfaceAccess().getRospublisherAssignment_6_3_1(), "rule__ComponentInterface__RospublisherAssignment_6_3_1");
81-
builder.put(grammarAccess.getComponentInterfaceAccess().getRossubscriberAssignment_7_2(), "rule__ComponentInterface__RossubscriberAssignment_7_2");
82-
builder.put(grammarAccess.getComponentInterfaceAccess().getRossubscriberAssignment_7_3_1(), "rule__ComponentInterface__RossubscriberAssignment_7_3_1");
83-
builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceserverAssignment_8_2(), "rule__ComponentInterface__RosserviceserverAssignment_8_2");
84-
builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceserverAssignment_8_3_1(), "rule__ComponentInterface__RosserviceserverAssignment_8_3_1");
85-
builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceclientAssignment_9_2(), "rule__ComponentInterface__RosserviceclientAssignment_9_2");
86-
builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceclientAssignment_9_3_1(), "rule__ComponentInterface__RosserviceclientAssignment_9_3_1");
87-
builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionserverAssignment_10_2(), "rule__ComponentInterface__RosactionserverAssignment_10_2");
88-
builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionserverAssignment_10_3_1(), "rule__ComponentInterface__RosactionserverAssignment_10_3_1");
89-
builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionclientAssignment_11_2(), "rule__ComponentInterface__RosactionclientAssignment_11_2");
90-
builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionclientAssignment_11_3_1(), "rule__ComponentInterface__RosactionclientAssignment_11_3_1");
91-
builder.put(grammarAccess.getComponentInterfaceAccess().getRosparameterAssignment_12_2(), "rule__ComponentInterface__RosparameterAssignment_12_2");
92-
builder.put(grammarAccess.getComponentInterfaceAccess().getRosparameterAssignment_12_3_1(), "rule__ComponentInterface__RosparameterAssignment_12_3_1");
79+
builder.put(grammarAccess.getComponentInterfaceAccess().getRospublisherAssignment_6_0_2(), "rule__ComponentInterface__RospublisherAssignment_6_0_2");
80+
builder.put(grammarAccess.getComponentInterfaceAccess().getRospublisherAssignment_6_0_3_1(), "rule__ComponentInterface__RospublisherAssignment_6_0_3_1");
81+
builder.put(grammarAccess.getComponentInterfaceAccess().getRossubscriberAssignment_6_1_2(), "rule__ComponentInterface__RossubscriberAssignment_6_1_2");
82+
builder.put(grammarAccess.getComponentInterfaceAccess().getRossubscriberAssignment_6_1_3_1(), "rule__ComponentInterface__RossubscriberAssignment_6_1_3_1");
83+
builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceserverAssignment_6_2_2(), "rule__ComponentInterface__RosserviceserverAssignment_6_2_2");
84+
builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceserverAssignment_6_2_3_1(), "rule__ComponentInterface__RosserviceserverAssignment_6_2_3_1");
85+
builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceclientAssignment_6_3_2(), "rule__ComponentInterface__RosserviceclientAssignment_6_3_2");
86+
builder.put(grammarAccess.getComponentInterfaceAccess().getRosserviceclientAssignment_6_3_3_1(), "rule__ComponentInterface__RosserviceclientAssignment_6_3_3_1");
87+
builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionserverAssignment_6_4_2(), "rule__ComponentInterface__RosactionserverAssignment_6_4_2");
88+
builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionserverAssignment_6_4_3_1(), "rule__ComponentInterface__RosactionserverAssignment_6_4_3_1");
89+
builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionclientAssignment_6_5_2(), "rule__ComponentInterface__RosactionclientAssignment_6_5_2");
90+
builder.put(grammarAccess.getComponentInterfaceAccess().getRosactionclientAssignment_6_5_3_1(), "rule__ComponentInterface__RosactionclientAssignment_6_5_3_1");
91+
builder.put(grammarAccess.getComponentInterfaceAccess().getRosparameterAssignment_6_6_2(), "rule__ComponentInterface__RosparameterAssignment_6_6_2");
92+
builder.put(grammarAccess.getComponentInterfaceAccess().getRosparameterAssignment_6_6_3_1(), "rule__ComponentInterface__RosparameterAssignment_6_6_3_1");
9393
builder.put(grammarAccess.getRosPublisherAccess().getNameAssignment_2(), "rule__RosPublisher__NameAssignment_2");
9494
builder.put(grammarAccess.getRosPublisherAccess().getNsAssignment_4_1(), "rule__RosPublisher__NsAssignment_4_1");
9595
builder.put(grammarAccess.getRosPublisherAccess().getPublisherAssignment_6(), "rule__RosPublisher__PublisherAssignment_6");
@@ -125,6 +125,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
125125
builder.put(grammarAccess.getParameterStructAccess().getValueAssignment_1_2_2(), "rule__ParameterStruct__ValueAssignment_1_2_2");
126126
builder.put(grammarAccess.getParameterStructMemberAccess().getNameAssignment_0(), "rule__ParameterStructMember__NameAssignment_0");
127127
builder.put(grammarAccess.getParameterStructMemberAccess().getValueAssignment_3(), "rule__ParameterStructMember__ValueAssignment_3");
128+
builder.put(grammarAccess.getComponentInterfaceAccess().getUnorderedGroup_6(), "rule__ComponentInterface__UnorderedGroup_6");
128129
}
129130
}
130131

0 commit comments

Comments
 (0)