Skip to content

Commit 8976943

Browse files
ipa-nhgipa-nhg
committed
Fix Array parameters
1 parent 6a92417 commit 8976943

77 files changed

Lines changed: 15277 additions & 16402 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
7373
builder.put(grammarAccess.getParameterAnyTypeAccess().getGroup(), "rule__ParameterAnyType__Group__0");
7474
builder.put(grammarAccess.getParameterAnyTypeAccess().getGroup_2(), "rule__ParameterAnyType__Group_2__0");
7575
builder.put(grammarAccess.getParameterArrayTypeAccess().getGroup(), "rule__ParameterArrayType__Group__0");
76-
builder.put(grammarAccess.getParameterArrayTypeAccess().getGroup_3(), "rule__ParameterArrayType__Group_3__0");
76+
builder.put(grammarAccess.getParameterArrayTypeAccess().getGroup_2(), "rule__ParameterArrayType__Group_2__0");
7777
builder.put(grammarAccess.getParameterListAccess().getGroup(), "rule__ParameterList__Group__0");
7878
builder.put(grammarAccess.getParameterListAccess().getGroup_3(), "rule__ParameterList__Group_3__0");
7979
builder.put(grammarAccess.getParameterAnyAccess().getGroup(), "rule__ParameterAny__Group__0");
@@ -136,8 +136,8 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
136136
builder.put(grammarAccess.getParameterBooleanTypeAccess().getDefaultAssignment_2_1(), "rule__ParameterBooleanType__DefaultAssignment_2_1");
137137
builder.put(grammarAccess.getParameterBase64TypeAccess().getDefaultAssignment_2_1(), "rule__ParameterBase64Type__DefaultAssignment_2_1");
138138
builder.put(grammarAccess.getParameterAnyTypeAccess().getDefaultAssignment_2_1(), "rule__ParameterAnyType__DefaultAssignment_2_1");
139-
builder.put(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_2(), "rule__ParameterArrayType__TypeAssignment_2");
140-
builder.put(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_3_1(), "rule__ParameterArrayType__DefaultAssignment_3_1");
139+
builder.put(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_1(), "rule__ParameterArrayType__TypeAssignment_1");
140+
builder.put(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_2_1(), "rule__ParameterArrayType__DefaultAssignment_2_1");
141141
builder.put(grammarAccess.getParameterListAccess().getValueAssignment_2(), "rule__ParameterList__ValueAssignment_2");
142142
builder.put(grammarAccess.getParameterListAccess().getValueAssignment_3_1(), "rule__ParameterList__ValueAssignment_3_1");
143143
builder.put(grammarAccess.getParameterAnyAccess().getValueAssignment_2_1(), "rule__ParameterAny__ValueAssignment_2_1");

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
117117
builder.put(grammarAccess.getParameterAnyTypeAccess().getGroup(), "rule__ParameterAnyType__Group__0");
118118
builder.put(grammarAccess.getParameterAnyTypeAccess().getGroup_2(), "rule__ParameterAnyType__Group_2__0");
119119
builder.put(grammarAccess.getParameterArrayTypeAccess().getGroup(), "rule__ParameterArrayType__Group__0");
120-
builder.put(grammarAccess.getParameterArrayTypeAccess().getGroup_3(), "rule__ParameterArrayType__Group_3__0");
120+
builder.put(grammarAccess.getParameterArrayTypeAccess().getGroup_2(), "rule__ParameterArrayType__Group_2__0");
121121
builder.put(grammarAccess.getParameterListAccess().getGroup(), "rule__ParameterList__Group__0");
122122
builder.put(grammarAccess.getParameterListAccess().getGroup_3(), "rule__ParameterList__Group_3__0");
123123
builder.put(grammarAccess.getParameterAnyAccess().getGroup(), "rule__ParameterAny__Group__0");
@@ -228,8 +228,8 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
228228
builder.put(grammarAccess.getParameterBooleanTypeAccess().getDefaultAssignment_2_1(), "rule__ParameterBooleanType__DefaultAssignment_2_1");
229229
builder.put(grammarAccess.getParameterBase64TypeAccess().getDefaultAssignment_2_1(), "rule__ParameterBase64Type__DefaultAssignment_2_1");
230230
builder.put(grammarAccess.getParameterAnyTypeAccess().getDefaultAssignment_2_1(), "rule__ParameterAnyType__DefaultAssignment_2_1");
231-
builder.put(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_2(), "rule__ParameterArrayType__TypeAssignment_2");
232-
builder.put(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_3_1(), "rule__ParameterArrayType__DefaultAssignment_3_1");
231+
builder.put(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_1(), "rule__ParameterArrayType__TypeAssignment_1");
232+
builder.put(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_2_1(), "rule__ParameterArrayType__DefaultAssignment_2_1");
233233
builder.put(grammarAccess.getParameterListAccess().getValueAssignment_2(), "rule__ParameterList__ValueAssignment_2");
234234
builder.put(grammarAccess.getParameterListAccess().getValueAssignment_3_1(), "rule__ParameterList__ValueAssignment_3_1");
235235
builder.put(grammarAccess.getParameterAnyAccess().getValueAssignment_2_1(), "rule__ParameterAny__ValueAssignment_2_1");

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

Lines changed: 28 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ import de.fraunhofer.ipa.ros.services.BasicsGrammarAccess;
4949
tokenNameToValue.put("Node", "'node'");
5050
tokenNameToValue.put("Time", "'time'");
5151
tokenNameToValue.put("Type", "'type'");
52+
tokenNameToValue.put("Array", "'Array'");
5253
tokenNameToValue.put("Int16", "'int16'");
5354
tokenNameToValue.put("Int32", "'int32'");
5455
tokenNameToValue.put("Int64", "'int64'");
5556
tokenNameToValue.put("Type_1", "'type:'");
5657
tokenNameToValue.put("Uint8", "'uint8'");
5758
tokenNameToValue.put("Value", "'value'");
58-
tokenNameToValue.put("Array", "'Array:'");
5959
tokenNameToValue.put("Base64", "'Base64'");
6060
tokenNameToValue.put("Double", "'Double'");
6161
tokenNameToValue.put("Header", "'Header'");
@@ -4083,9 +4083,9 @@ rule__ParameterArrayType__Group__0__Impl
40834083
}
40844084
:
40854085
(
4086-
{ before(grammarAccess.getParameterArrayTypeAccess().getBEGINTerminalRuleCall_0()); }
4087-
RULE_BEGIN
4088-
{ after(grammarAccess.getParameterArrayTypeAccess().getBEGINTerminalRuleCall_0()); }
4086+
{ before(grammarAccess.getParameterArrayTypeAccess().getArrayKeyword_0()); }
4087+
Array
4088+
{ after(grammarAccess.getParameterArrayTypeAccess().getArrayKeyword_0()); }
40894089
)
40904090
;
40914091
finally {
@@ -4110,9 +4110,9 @@ rule__ParameterArrayType__Group__1__Impl
41104110
}
41114111
:
41124112
(
4113-
{ before(grammarAccess.getParameterArrayTypeAccess().getArrayKeyword_1()); }
4114-
Array
4115-
{ after(grammarAccess.getParameterArrayTypeAccess().getArrayKeyword_1()); }
4113+
{ before(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_1()); }
4114+
(rule__ParameterArrayType__TypeAssignment_1)
4115+
{ after(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_1()); }
41164116
)
41174117
;
41184118
finally {
@@ -4125,7 +4125,6 @@ rule__ParameterArrayType__Group__2
41254125
}
41264126
:
41274127
rule__ParameterArrayType__Group__2__Impl
4128-
rule__ParameterArrayType__Group__3
41294128
;
41304129
finally {
41314130
restoreStackSize(stackSize);
@@ -4137,116 +4136,63 @@ rule__ParameterArrayType__Group__2__Impl
41374136
}
41384137
:
41394138
(
4140-
{ before(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_2()); }
4141-
(rule__ParameterArrayType__TypeAssignment_2)
4142-
{ after(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_2()); }
4143-
)
4144-
;
4145-
finally {
4146-
restoreStackSize(stackSize);
4147-
}
4148-
4149-
rule__ParameterArrayType__Group__3
4150-
@init {
4151-
int stackSize = keepStackSize();
4152-
}
4153-
:
4154-
rule__ParameterArrayType__Group__3__Impl
4155-
rule__ParameterArrayType__Group__4
4156-
;
4157-
finally {
4158-
restoreStackSize(stackSize);
4159-
}
4160-
4161-
rule__ParameterArrayType__Group__3__Impl
4162-
@init {
4163-
int stackSize = keepStackSize();
4164-
}
4165-
:
4166-
(
4167-
{ before(grammarAccess.getParameterArrayTypeAccess().getGroup_3()); }
4168-
(rule__ParameterArrayType__Group_3__0)?
4169-
{ after(grammarAccess.getParameterArrayTypeAccess().getGroup_3()); }
4170-
)
4171-
;
4172-
finally {
4173-
restoreStackSize(stackSize);
4174-
}
4175-
4176-
rule__ParameterArrayType__Group__4
4177-
@init {
4178-
int stackSize = keepStackSize();
4179-
}
4180-
:
4181-
rule__ParameterArrayType__Group__4__Impl
4182-
;
4183-
finally {
4184-
restoreStackSize(stackSize);
4185-
}
4186-
4187-
rule__ParameterArrayType__Group__4__Impl
4188-
@init {
4189-
int stackSize = keepStackSize();
4190-
}
4191-
:
4192-
(
4193-
{ before(grammarAccess.getParameterArrayTypeAccess().getENDTerminalRuleCall_4()); }
4194-
RULE_END
4195-
{ after(grammarAccess.getParameterArrayTypeAccess().getENDTerminalRuleCall_4()); }
4139+
{ before(grammarAccess.getParameterArrayTypeAccess().getGroup_2()); }
4140+
(rule__ParameterArrayType__Group_2__0)?
4141+
{ after(grammarAccess.getParameterArrayTypeAccess().getGroup_2()); }
41964142
)
41974143
;
41984144
finally {
41994145
restoreStackSize(stackSize);
42004146
}
42014147

42024148

4203-
rule__ParameterArrayType__Group_3__0
4149+
rule__ParameterArrayType__Group_2__0
42044150
@init {
42054151
int stackSize = keepStackSize();
42064152
}
42074153
:
4208-
rule__ParameterArrayType__Group_3__0__Impl
4209-
rule__ParameterArrayType__Group_3__1
4154+
rule__ParameterArrayType__Group_2__0__Impl
4155+
rule__ParameterArrayType__Group_2__1
42104156
;
42114157
finally {
42124158
restoreStackSize(stackSize);
42134159
}
42144160

4215-
rule__ParameterArrayType__Group_3__0__Impl
4161+
rule__ParameterArrayType__Group_2__0__Impl
42164162
@init {
42174163
int stackSize = keepStackSize();
42184164
}
42194165
:
42204166
(
4221-
{ before(grammarAccess.getParameterArrayTypeAccess().getDefaultKeyword_3_0()); }
4167+
{ before(grammarAccess.getParameterArrayTypeAccess().getDefaultKeyword_2_0()); }
42224168
Default
4223-
{ after(grammarAccess.getParameterArrayTypeAccess().getDefaultKeyword_3_0()); }
4169+
{ after(grammarAccess.getParameterArrayTypeAccess().getDefaultKeyword_2_0()); }
42244170
)
42254171
;
42264172
finally {
42274173
restoreStackSize(stackSize);
42284174
}
42294175

4230-
rule__ParameterArrayType__Group_3__1
4176+
rule__ParameterArrayType__Group_2__1
42314177
@init {
42324178
int stackSize = keepStackSize();
42334179
}
42344180
:
4235-
rule__ParameterArrayType__Group_3__1__Impl
4181+
rule__ParameterArrayType__Group_2__1__Impl
42364182
;
42374183
finally {
42384184
restoreStackSize(stackSize);
42394185
}
42404186

4241-
rule__ParameterArrayType__Group_3__1__Impl
4187+
rule__ParameterArrayType__Group_2__1__Impl
42424188
@init {
42434189
int stackSize = keepStackSize();
42444190
}
42454191
:
42464192
(
4247-
{ before(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_3_1()); }
4248-
(rule__ParameterArrayType__DefaultAssignment_3_1)
4249-
{ after(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_3_1()); }
4193+
{ before(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_2_1()); }
4194+
(rule__ParameterArrayType__DefaultAssignment_2_1)
4195+
{ after(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_2_1()); }
42504196
)
42514197
;
42524198
finally {
@@ -6855,30 +6801,30 @@ finally {
68556801
restoreStackSize(stackSize);
68566802
}
68576803

6858-
rule__ParameterArrayType__TypeAssignment_2
6804+
rule__ParameterArrayType__TypeAssignment_1
68596805
@init {
68606806
int stackSize = keepStackSize();
68616807
}
68626808
:
68636809
(
6864-
{ before(grammarAccess.getParameterArrayTypeAccess().getTypeParameterTypeParserRuleCall_2_0()); }
6810+
{ before(grammarAccess.getParameterArrayTypeAccess().getTypeParameterTypeParserRuleCall_1_0()); }
68656811
ruleParameterType
6866-
{ after(grammarAccess.getParameterArrayTypeAccess().getTypeParameterTypeParserRuleCall_2_0()); }
6812+
{ after(grammarAccess.getParameterArrayTypeAccess().getTypeParameterTypeParserRuleCall_1_0()); }
68676813
)
68686814
;
68696815
finally {
68706816
restoreStackSize(stackSize);
68716817
}
68726818

6873-
rule__ParameterArrayType__DefaultAssignment_3_1
6819+
rule__ParameterArrayType__DefaultAssignment_2_1
68746820
@init {
68756821
int stackSize = keepStackSize();
68766822
}
68776823
:
68786824
(
6879-
{ before(grammarAccess.getParameterArrayTypeAccess().getDefaultParameterListParserRuleCall_3_1_0()); }
6825+
{ before(grammarAccess.getParameterArrayTypeAccess().getDefaultParameterListParserRuleCall_2_1_0()); }
68806826
ruleParameterList
6881-
{ after(grammarAccess.getParameterArrayTypeAccess().getDefaultParameterListParserRuleCall_3_1_0()); }
6827+
{ after(grammarAccess.getParameterArrayTypeAccess().getDefaultParameterListParserRuleCall_2_1_0()); }
68826828
)
68836829
;
68846830
finally {

0 commit comments

Comments
 (0)