Skip to content

Commit f659718

Browse files
ipa-nhgipa-nhg
committed
Fix grammar for structures as parameters
1 parent 5c4162f commit f659718

42 files changed

Lines changed: 8932 additions & 12232 deletions

File tree

Some content is hidden

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

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
8080
builder.put(grammarAccess.getParameterAnyAccess().getGroup_2(), "rule__ParameterAny__Group_2__0");
8181
builder.put(grammarAccess.getParameterStructAccess().getGroup(), "rule__ParameterStruct__Group__0");
8282
builder.put(grammarAccess.getParameterStructAccess().getGroup_1(), "rule__ParameterStruct__Group_1__0");
83-
builder.put(grammarAccess.getParameterStructAccess().getGroup_1_2(), "rule__ParameterStruct__Group_1_2__0");
8483
builder.put(grammarAccess.getParameterStructMemberAccess().getGroup(), "rule__ParameterStructMember__Group__0");
8584
builder.put(grammarAccess.getParameterStructTypeMemberAccess().getGroup(), "rule__ParameterStructTypeMember__Group__0");
8685
builder.put(grammarAccess.getMessagePartAccess().getGroup(), "rule__MessagePart__Group__0");
@@ -147,11 +146,10 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
147146
builder.put(grammarAccess.getParameterIntegerAccess().getValueAssignment(), "rule__ParameterInteger__ValueAssignment");
148147
builder.put(grammarAccess.getParameterDoubleAccess().getValueAssignment(), "rule__ParameterDouble__ValueAssignment");
149148
builder.put(grammarAccess.getParameterBooleanAccess().getValueAssignment(), "rule__ParameterBoolean__ValueAssignment");
150-
builder.put(grammarAccess.getParameterStructAccess().getValueAssignment_1_1(), "rule__ParameterStruct__ValueAssignment_1_1");
151-
builder.put(grammarAccess.getParameterStructAccess().getValueAssignment_1_2_2(), "rule__ParameterStruct__ValueAssignment_1_2_2");
149+
builder.put(grammarAccess.getParameterStructAccess().getValueAssignment_1_2(), "rule__ParameterStruct__ValueAssignment_1_2");
152150
builder.put(grammarAccess.getParameterDateAccess().getValueAssignment(), "rule__ParameterDate__ValueAssignment");
153151
builder.put(grammarAccess.getParameterStructMemberAccess().getNameAssignment_0(), "rule__ParameterStructMember__NameAssignment_0");
154-
builder.put(grammarAccess.getParameterStructMemberAccess().getValueAssignment_3(), "rule__ParameterStructMember__ValueAssignment_3");
152+
builder.put(grammarAccess.getParameterStructMemberAccess().getValueAssignment_2(), "rule__ParameterStructMember__ValueAssignment_2");
155153
builder.put(grammarAccess.getParameterStructTypeMemberAccess().getNameAssignment_0(), "rule__ParameterStructTypeMember__NameAssignment_0");
156154
builder.put(grammarAccess.getParameterStructTypeMemberAccess().getTypeAssignment_1(), "rule__ParameterStructTypeMember__TypeAssignment_1");
157155
builder.put(grammarAccess.getMessagePartAccess().getTypeAssignment_0(), "rule__MessagePart__TypeAssignment_0");

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
124124
builder.put(grammarAccess.getParameterAnyAccess().getGroup_2(), "rule__ParameterAny__Group_2__0");
125125
builder.put(grammarAccess.getParameterStructAccess().getGroup(), "rule__ParameterStruct__Group__0");
126126
builder.put(grammarAccess.getParameterStructAccess().getGroup_1(), "rule__ParameterStruct__Group_1__0");
127-
builder.put(grammarAccess.getParameterStructAccess().getGroup_1_2(), "rule__ParameterStruct__Group_1_2__0");
128127
builder.put(grammarAccess.getParameterStructMemberAccess().getGroup(), "rule__ParameterStructMember__Group__0");
129128
builder.put(grammarAccess.getParameterStructTypeMemberAccess().getGroup(), "rule__ParameterStructTypeMember__Group__0");
130129
builder.put(grammarAccess.getMessagePartAccess().getGroup(), "rule__MessagePart__Group__0");
@@ -239,11 +238,10 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
239238
builder.put(grammarAccess.getParameterIntegerAccess().getValueAssignment(), "rule__ParameterInteger__ValueAssignment");
240239
builder.put(grammarAccess.getParameterDoubleAccess().getValueAssignment(), "rule__ParameterDouble__ValueAssignment");
241240
builder.put(grammarAccess.getParameterBooleanAccess().getValueAssignment(), "rule__ParameterBoolean__ValueAssignment");
242-
builder.put(grammarAccess.getParameterStructAccess().getValueAssignment_1_1(), "rule__ParameterStruct__ValueAssignment_1_1");
243-
builder.put(grammarAccess.getParameterStructAccess().getValueAssignment_1_2_2(), "rule__ParameterStruct__ValueAssignment_1_2_2");
241+
builder.put(grammarAccess.getParameterStructAccess().getValueAssignment_1_2(), "rule__ParameterStruct__ValueAssignment_1_2");
244242
builder.put(grammarAccess.getParameterDateAccess().getValueAssignment(), "rule__ParameterDate__ValueAssignment");
245243
builder.put(grammarAccess.getParameterStructMemberAccess().getNameAssignment_0(), "rule__ParameterStructMember__NameAssignment_0");
246-
builder.put(grammarAccess.getParameterStructMemberAccess().getValueAssignment_3(), "rule__ParameterStructMember__ValueAssignment_3");
244+
builder.put(grammarAccess.getParameterStructMemberAccess().getValueAssignment_2(), "rule__ParameterStructMember__ValueAssignment_2");
247245
builder.put(grammarAccess.getParameterStructTypeMemberAccess().getNameAssignment_0(), "rule__ParameterStructTypeMember__NameAssignment_0");
248246
builder.put(grammarAccess.getParameterStructTypeMemberAccess().getTypeAssignment_1(), "rule__ParameterStructTypeMember__TypeAssignment_1");
249247
builder.put(grammarAccess.getMessagePartAccess().getTypeAssignment_0(), "rule__MessagePart__TypeAssignment_0");

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

Lines changed: 22 additions & 172 deletions
Original file line numberDiff line numberDiff line change
@@ -4677,9 +4677,9 @@ rule__ParameterStruct__Group_1__1__Impl
46774677
}
46784678
:
46794679
(
4680-
{ before(grammarAccess.getParameterStructAccess().getValueAssignment_1_1()); }
4681-
(rule__ParameterStruct__ValueAssignment_1_1)
4682-
{ after(grammarAccess.getParameterStructAccess().getValueAssignment_1_1()); }
4680+
{ before(grammarAccess.getParameterStructAccess().getBEGINTerminalRuleCall_1_1()); }
4681+
RULE_BEGIN
4682+
{ after(grammarAccess.getParameterStructAccess().getBEGINTerminalRuleCall_1_1()); }
46834683
)
46844684
;
46854685
finally {
@@ -4704,9 +4704,9 @@ rule__ParameterStruct__Group_1__2__Impl
47044704
}
47054705
:
47064706
(
4707-
{ before(grammarAccess.getParameterStructAccess().getGroup_1_2()); }
4708-
(rule__ParameterStruct__Group_1_2__0)*
4709-
{ after(grammarAccess.getParameterStructAccess().getGroup_1_2()); }
4707+
{ before(grammarAccess.getParameterStructAccess().getValueAssignment_1_2()); }
4708+
(rule__ParameterStruct__ValueAssignment_1_2)*
4709+
{ after(grammarAccess.getParameterStructAccess().getValueAssignment_1_2()); }
47104710
)
47114711
;
47124712
finally {
@@ -4719,6 +4719,7 @@ rule__ParameterStruct__Group_1__3
47194719
}
47204720
:
47214721
rule__ParameterStruct__Group_1__3__Impl
4722+
rule__ParameterStruct__Group_1__4
47224723
;
47234724
finally {
47244725
restoreStackSize(stackSize);
@@ -4739,108 +4740,26 @@ finally {
47394740
restoreStackSize(stackSize);
47404741
}
47414742

4742-
4743-
rule__ParameterStruct__Group_1_2__0
4744-
@init {
4745-
int stackSize = keepStackSize();
4746-
}
4747-
:
4748-
rule__ParameterStruct__Group_1_2__0__Impl
4749-
rule__ParameterStruct__Group_1_2__1
4750-
;
4751-
finally {
4752-
restoreStackSize(stackSize);
4753-
}
4754-
4755-
rule__ParameterStruct__Group_1_2__0__Impl
4756-
@init {
4757-
int stackSize = keepStackSize();
4758-
}
4759-
:
4760-
(
4761-
{ before(grammarAccess.getParameterStructAccess().getCommaKeyword_1_2_0()); }
4762-
Comma
4763-
{ after(grammarAccess.getParameterStructAccess().getCommaKeyword_1_2_0()); }
4764-
)
4765-
;
4766-
finally {
4767-
restoreStackSize(stackSize);
4768-
}
4769-
4770-
rule__ParameterStruct__Group_1_2__1
4771-
@init {
4772-
int stackSize = keepStackSize();
4773-
}
4774-
:
4775-
rule__ParameterStruct__Group_1_2__1__Impl
4776-
rule__ParameterStruct__Group_1_2__2
4777-
;
4778-
finally {
4779-
restoreStackSize(stackSize);
4780-
}
4781-
4782-
rule__ParameterStruct__Group_1_2__1__Impl
4783-
@init {
4784-
int stackSize = keepStackSize();
4785-
}
4786-
:
4787-
(
4788-
{ before(grammarAccess.getParameterStructAccess().getLeftSquareBracketKeyword_1_2_1()); }
4789-
LeftSquareBracket
4790-
{ after(grammarAccess.getParameterStructAccess().getLeftSquareBracketKeyword_1_2_1()); }
4791-
)
4792-
;
4793-
finally {
4794-
restoreStackSize(stackSize);
4795-
}
4796-
4797-
rule__ParameterStruct__Group_1_2__2
4798-
@init {
4799-
int stackSize = keepStackSize();
4800-
}
4801-
:
4802-
rule__ParameterStruct__Group_1_2__2__Impl
4803-
rule__ParameterStruct__Group_1_2__3
4804-
;
4805-
finally {
4806-
restoreStackSize(stackSize);
4807-
}
4808-
4809-
rule__ParameterStruct__Group_1_2__2__Impl
4810-
@init {
4811-
int stackSize = keepStackSize();
4812-
}
4813-
:
4814-
(
4815-
{ before(grammarAccess.getParameterStructAccess().getValueAssignment_1_2_2()); }
4816-
(rule__ParameterStruct__ValueAssignment_1_2_2)
4817-
{ after(grammarAccess.getParameterStructAccess().getValueAssignment_1_2_2()); }
4818-
)
4819-
;
4820-
finally {
4821-
restoreStackSize(stackSize);
4822-
}
4823-
4824-
rule__ParameterStruct__Group_1_2__3
4743+
rule__ParameterStruct__Group_1__4
48254744
@init {
48264745
int stackSize = keepStackSize();
48274746
}
48284747
:
4829-
rule__ParameterStruct__Group_1_2__3__Impl
4748+
rule__ParameterStruct__Group_1__4__Impl
48304749
;
48314750
finally {
48324751
restoreStackSize(stackSize);
48334752
}
48344753

4835-
rule__ParameterStruct__Group_1_2__3__Impl
4754+
rule__ParameterStruct__Group_1__4__Impl
48364755
@init {
48374756
int stackSize = keepStackSize();
48384757
}
48394758
:
48404759
(
4841-
{ before(grammarAccess.getParameterStructAccess().getRightSquareBracketKeyword_1_2_3()); }
4842-
RightSquareBracket
4843-
{ after(grammarAccess.getParameterStructAccess().getRightSquareBracketKeyword_1_2_3()); }
4760+
{ before(grammarAccess.getParameterStructAccess().getENDTerminalRuleCall_1_4()); }
4761+
RULE_END
4762+
{ after(grammarAccess.getParameterStructAccess().getENDTerminalRuleCall_1_4()); }
48444763
)
48454764
;
48464765
finally {
@@ -4908,7 +4827,6 @@ rule__ParameterStructMember__Group__2
49084827
}
49094828
:
49104829
rule__ParameterStructMember__Group__2__Impl
4911-
rule__ParameterStructMember__Group__3
49124830
;
49134831
finally {
49144832
restoreStackSize(stackSize);
@@ -4920,62 +4838,9 @@ rule__ParameterStructMember__Group__2__Impl
49204838
}
49214839
:
49224840
(
4923-
{ before(grammarAccess.getParameterStructMemberAccess().getBEGINTerminalRuleCall_2()); }
4924-
RULE_BEGIN
4925-
{ after(grammarAccess.getParameterStructMemberAccess().getBEGINTerminalRuleCall_2()); }
4926-
)
4927-
;
4928-
finally {
4929-
restoreStackSize(stackSize);
4930-
}
4931-
4932-
rule__ParameterStructMember__Group__3
4933-
@init {
4934-
int stackSize = keepStackSize();
4935-
}
4936-
:
4937-
rule__ParameterStructMember__Group__3__Impl
4938-
rule__ParameterStructMember__Group__4
4939-
;
4940-
finally {
4941-
restoreStackSize(stackSize);
4942-
}
4943-
4944-
rule__ParameterStructMember__Group__3__Impl
4945-
@init {
4946-
int stackSize = keepStackSize();
4947-
}
4948-
:
4949-
(
4950-
{ before(grammarAccess.getParameterStructMemberAccess().getValueAssignment_3()); }
4951-
(rule__ParameterStructMember__ValueAssignment_3)
4952-
{ after(grammarAccess.getParameterStructMemberAccess().getValueAssignment_3()); }
4953-
)
4954-
;
4955-
finally {
4956-
restoreStackSize(stackSize);
4957-
}
4958-
4959-
rule__ParameterStructMember__Group__4
4960-
@init {
4961-
int stackSize = keepStackSize();
4962-
}
4963-
:
4964-
rule__ParameterStructMember__Group__4__Impl
4965-
;
4966-
finally {
4967-
restoreStackSize(stackSize);
4968-
}
4969-
4970-
rule__ParameterStructMember__Group__4__Impl
4971-
@init {
4972-
int stackSize = keepStackSize();
4973-
}
4974-
:
4975-
(
4976-
{ before(grammarAccess.getParameterStructMemberAccess().getENDTerminalRuleCall_4()); }
4977-
RULE_END
4978-
{ after(grammarAccess.getParameterStructMemberAccess().getENDTerminalRuleCall_4()); }
4841+
{ before(grammarAccess.getParameterStructMemberAccess().getValueAssignment_2()); }
4842+
(rule__ParameterStructMember__ValueAssignment_2)
4843+
{ after(grammarAccess.getParameterStructMemberAccess().getValueAssignment_2()); }
49794844
)
49804845
;
49814846
finally {
@@ -7140,30 +7005,15 @@ finally {
71407005
restoreStackSize(stackSize);
71417006
}
71427007

7143-
rule__ParameterStruct__ValueAssignment_1_1
7144-
@init {
7145-
int stackSize = keepStackSize();
7146-
}
7147-
:
7148-
(
7149-
{ before(grammarAccess.getParameterStructAccess().getValueParameterStructMemberParserRuleCall_1_1_0()); }
7150-
ruleParameterStructMember
7151-
{ after(grammarAccess.getParameterStructAccess().getValueParameterStructMemberParserRuleCall_1_1_0()); }
7152-
)
7153-
;
7154-
finally {
7155-
restoreStackSize(stackSize);
7156-
}
7157-
7158-
rule__ParameterStruct__ValueAssignment_1_2_2
7008+
rule__ParameterStruct__ValueAssignment_1_2
71597009
@init {
71607010
int stackSize = keepStackSize();
71617011
}
71627012
:
71637013
(
7164-
{ before(grammarAccess.getParameterStructAccess().getValueParameterStructMemberParserRuleCall_1_2_2_0()); }
7014+
{ before(grammarAccess.getParameterStructAccess().getValueParameterStructMemberParserRuleCall_1_2_0()); }
71657015
ruleParameterStructMember
7166-
{ after(grammarAccess.getParameterStructAccess().getValueParameterStructMemberParserRuleCall_1_2_2_0()); }
7016+
{ after(grammarAccess.getParameterStructAccess().getValueParameterStructMemberParserRuleCall_1_2_0()); }
71677017
)
71687018
;
71697019
finally {
@@ -7200,15 +7050,15 @@ finally {
72007050
restoreStackSize(stackSize);
72017051
}
72027052

7203-
rule__ParameterStructMember__ValueAssignment_3
7053+
rule__ParameterStructMember__ValueAssignment_2
72047054
@init {
72057055
int stackSize = keepStackSize();
72067056
}
72077057
:
72087058
(
7209-
{ before(grammarAccess.getParameterStructMemberAccess().getValueParameterValueParserRuleCall_3_0()); }
7059+
{ before(grammarAccess.getParameterStructMemberAccess().getValueParameterValueParserRuleCall_2_0()); }
72107060
ruleParameterValue
7211-
{ after(grammarAccess.getParameterStructMemberAccess().getValueParameterValueParserRuleCall_3_0()); }
7061+
{ after(grammarAccess.getParameterStructMemberAccess().getValueParameterValueParserRuleCall_2_0()); }
72127062
)
72137063
;
72147064
finally {

0 commit comments

Comments
 (0)