Skip to content

Commit

Permalink
Fix Array parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
@ipa-nhg
ipa-nhg committed Jan 29, 2024
1 parent 6a92417 commit 8976943
Show file tree
Hide file tree
Showing 77 changed files with 15,277 additions and 16,402 deletions.
6 changes: 3 additions & 3 deletions ...ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/BasicsParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
builder.put(grammarAccess.getParameterAnyTypeAccess().getGroup(), "rule__ParameterAnyType__Group__0");
builder.put(grammarAccess.getParameterAnyTypeAccess().getGroup_2(), "rule__ParameterAnyType__Group_2__0");
builder.put(grammarAccess.getParameterArrayTypeAccess().getGroup(), "rule__ParameterArrayType__Group__0");
builder.put(grammarAccess.getParameterArrayTypeAccess().getGroup_3(), "rule__ParameterArrayType__Group_3__0");
builder.put(grammarAccess.getParameterArrayTypeAccess().getGroup_2(), "rule__ParameterArrayType__Group_2__0");
builder.put(grammarAccess.getParameterListAccess().getGroup(), "rule__ParameterList__Group__0");
builder.put(grammarAccess.getParameterListAccess().getGroup_3(), "rule__ParameterList__Group_3__0");
builder.put(grammarAccess.getParameterAnyAccess().getGroup(), "rule__ParameterAny__Group__0");
Expand Down Expand Up @@ -136,8 +136,8 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
builder.put(grammarAccess.getParameterBooleanTypeAccess().getDefaultAssignment_2_1(), "rule__ParameterBooleanType__DefaultAssignment_2_1");
builder.put(grammarAccess.getParameterBase64TypeAccess().getDefaultAssignment_2_1(), "rule__ParameterBase64Type__DefaultAssignment_2_1");
builder.put(grammarAccess.getParameterAnyTypeAccess().getDefaultAssignment_2_1(), "rule__ParameterAnyType__DefaultAssignment_2_1");
builder.put(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_2(), "rule__ParameterArrayType__TypeAssignment_2");
builder.put(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_3_1(), "rule__ParameterArrayType__DefaultAssignment_3_1");
builder.put(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_1(), "rule__ParameterArrayType__TypeAssignment_1");
builder.put(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_2_1(), "rule__ParameterArrayType__DefaultAssignment_2_1");
builder.put(grammarAccess.getParameterListAccess().getValueAssignment_2(), "rule__ParameterList__ValueAssignment_2");
builder.put(grammarAccess.getParameterListAccess().getValueAssignment_3_1(), "rule__ParameterList__ValueAssignment_3_1");
builder.put(grammarAccess.getParameterAnyAccess().getValueAssignment_2_1(), "rule__ParameterAny__ValueAssignment_2_1");
Expand Down
6 changes: 3 additions & 3 deletions ...er.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/RosParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
builder.put(grammarAccess.getParameterAnyTypeAccess().getGroup(), "rule__ParameterAnyType__Group__0");
builder.put(grammarAccess.getParameterAnyTypeAccess().getGroup_2(), "rule__ParameterAnyType__Group_2__0");
builder.put(grammarAccess.getParameterArrayTypeAccess().getGroup(), "rule__ParameterArrayType__Group__0");
builder.put(grammarAccess.getParameterArrayTypeAccess().getGroup_3(), "rule__ParameterArrayType__Group_3__0");
builder.put(grammarAccess.getParameterArrayTypeAccess().getGroup_2(), "rule__ParameterArrayType__Group_2__0");
builder.put(grammarAccess.getParameterListAccess().getGroup(), "rule__ParameterList__Group__0");
builder.put(grammarAccess.getParameterListAccess().getGroup_3(), "rule__ParameterList__Group_3__0");
builder.put(grammarAccess.getParameterAnyAccess().getGroup(), "rule__ParameterAny__Group__0");
Expand Down Expand Up @@ -228,8 +228,8 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
builder.put(grammarAccess.getParameterBooleanTypeAccess().getDefaultAssignment_2_1(), "rule__ParameterBooleanType__DefaultAssignment_2_1");
builder.put(grammarAccess.getParameterBase64TypeAccess().getDefaultAssignment_2_1(), "rule__ParameterBase64Type__DefaultAssignment_2_1");
builder.put(grammarAccess.getParameterAnyTypeAccess().getDefaultAssignment_2_1(), "rule__ParameterAnyType__DefaultAssignment_2_1");
builder.put(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_2(), "rule__ParameterArrayType__TypeAssignment_2");
builder.put(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_3_1(), "rule__ParameterArrayType__DefaultAssignment_3_1");
builder.put(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_1(), "rule__ParameterArrayType__TypeAssignment_1");
builder.put(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_2_1(), "rule__ParameterArrayType__DefaultAssignment_2_1");
builder.put(grammarAccess.getParameterListAccess().getValueAssignment_2(), "rule__ParameterList__ValueAssignment_2");
builder.put(grammarAccess.getParameterListAccess().getValueAssignment_3_1(), "rule__ParameterList__ValueAssignment_3_1");
builder.put(grammarAccess.getParameterAnyAccess().getValueAssignment_2_1(), "rule__ParameterAny__ValueAssignment_2_1");
Expand Down
110 changes: 28 additions & 82 deletions ...ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/internal/InternalBasicsParser.g
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ import de.fraunhofer.ipa.ros.services.BasicsGrammarAccess;
tokenNameToValue.put("Node", "'node'");
tokenNameToValue.put("Time", "'time'");
tokenNameToValue.put("Type", "'type'");
tokenNameToValue.put("Array", "'Array'");
tokenNameToValue.put("Int16", "'int16'");
tokenNameToValue.put("Int32", "'int32'");
tokenNameToValue.put("Int64", "'int64'");
tokenNameToValue.put("Type_1", "'type:'");
tokenNameToValue.put("Uint8", "'uint8'");
tokenNameToValue.put("Value", "'value'");
tokenNameToValue.put("Array", "'Array:'");
tokenNameToValue.put("Base64", "'Base64'");
tokenNameToValue.put("Double", "'Double'");
tokenNameToValue.put("Header", "'Header'");
Expand Down Expand Up @@ -4083,9 +4083,9 @@ rule__ParameterArrayType__Group__0__Impl
}
:
(
{ before(grammarAccess.getParameterArrayTypeAccess().getBEGINTerminalRuleCall_0()); }
RULE_BEGIN
{ after(grammarAccess.getParameterArrayTypeAccess().getBEGINTerminalRuleCall_0()); }
{ before(grammarAccess.getParameterArrayTypeAccess().getArrayKeyword_0()); }
Array
{ after(grammarAccess.getParameterArrayTypeAccess().getArrayKeyword_0()); }
)
;
finally {
Expand All @@ -4110,9 +4110,9 @@ rule__ParameterArrayType__Group__1__Impl
}
:
(
{ before(grammarAccess.getParameterArrayTypeAccess().getArrayKeyword_1()); }
Array
{ after(grammarAccess.getParameterArrayTypeAccess().getArrayKeyword_1()); }
{ before(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_1()); }
(rule__ParameterArrayType__TypeAssignment_1)
{ after(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_1()); }
)
;
finally {
Expand All @@ -4125,7 +4125,6 @@ rule__ParameterArrayType__Group__2
}
:
rule__ParameterArrayType__Group__2__Impl
rule__ParameterArrayType__Group__3
;
finally {
restoreStackSize(stackSize);
Expand All @@ -4137,116 +4136,63 @@ rule__ParameterArrayType__Group__2__Impl
}
:
(
{ before(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_2()); }
(rule__ParameterArrayType__TypeAssignment_2)
{ after(grammarAccess.getParameterArrayTypeAccess().getTypeAssignment_2()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__ParameterArrayType__Group__3
@init {
int stackSize = keepStackSize();
}
:
rule__ParameterArrayType__Group__3__Impl
rule__ParameterArrayType__Group__4
;
finally {
restoreStackSize(stackSize);
}

rule__ParameterArrayType__Group__3__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getParameterArrayTypeAccess().getGroup_3()); }
(rule__ParameterArrayType__Group_3__0)?
{ after(grammarAccess.getParameterArrayTypeAccess().getGroup_3()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__ParameterArrayType__Group__4
@init {
int stackSize = keepStackSize();
}
:
rule__ParameterArrayType__Group__4__Impl
;
finally {
restoreStackSize(stackSize);
}

rule__ParameterArrayType__Group__4__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getParameterArrayTypeAccess().getENDTerminalRuleCall_4()); }
RULE_END
{ after(grammarAccess.getParameterArrayTypeAccess().getENDTerminalRuleCall_4()); }
{ before(grammarAccess.getParameterArrayTypeAccess().getGroup_2()); }
(rule__ParameterArrayType__Group_2__0)?
{ after(grammarAccess.getParameterArrayTypeAccess().getGroup_2()); }
)
;
finally {
restoreStackSize(stackSize);
}


rule__ParameterArrayType__Group_3__0
rule__ParameterArrayType__Group_2__0
@init {
int stackSize = keepStackSize();
}
:
rule__ParameterArrayType__Group_3__0__Impl
rule__ParameterArrayType__Group_3__1
rule__ParameterArrayType__Group_2__0__Impl
rule__ParameterArrayType__Group_2__1
;
finally {
restoreStackSize(stackSize);
}

rule__ParameterArrayType__Group_3__0__Impl
rule__ParameterArrayType__Group_2__0__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getParameterArrayTypeAccess().getDefaultKeyword_3_0()); }
{ before(grammarAccess.getParameterArrayTypeAccess().getDefaultKeyword_2_0()); }
Default
{ after(grammarAccess.getParameterArrayTypeAccess().getDefaultKeyword_3_0()); }
{ after(grammarAccess.getParameterArrayTypeAccess().getDefaultKeyword_2_0()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__ParameterArrayType__Group_3__1
rule__ParameterArrayType__Group_2__1
@init {
int stackSize = keepStackSize();
}
:
rule__ParameterArrayType__Group_3__1__Impl
rule__ParameterArrayType__Group_2__1__Impl
;
finally {
restoreStackSize(stackSize);
}

rule__ParameterArrayType__Group_3__1__Impl
rule__ParameterArrayType__Group_2__1__Impl
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_3_1()); }
(rule__ParameterArrayType__DefaultAssignment_3_1)
{ after(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_3_1()); }
{ before(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_2_1()); }
(rule__ParameterArrayType__DefaultAssignment_2_1)
{ after(grammarAccess.getParameterArrayTypeAccess().getDefaultAssignment_2_1()); }
)
;
finally {
Expand Down Expand Up @@ -6855,30 +6801,30 @@ finally {
restoreStackSize(stackSize);
}

rule__ParameterArrayType__TypeAssignment_2
rule__ParameterArrayType__TypeAssignment_1
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getParameterArrayTypeAccess().getTypeParameterTypeParserRuleCall_2_0()); }
{ before(grammarAccess.getParameterArrayTypeAccess().getTypeParameterTypeParserRuleCall_1_0()); }
ruleParameterType
{ after(grammarAccess.getParameterArrayTypeAccess().getTypeParameterTypeParserRuleCall_2_0()); }
{ after(grammarAccess.getParameterArrayTypeAccess().getTypeParameterTypeParserRuleCall_1_0()); }
)
;
finally {
restoreStackSize(stackSize);
}

rule__ParameterArrayType__DefaultAssignment_3_1
rule__ParameterArrayType__DefaultAssignment_2_1
@init {
int stackSize = keepStackSize();
}
:
(
{ before(grammarAccess.getParameterArrayTypeAccess().getDefaultParameterListParserRuleCall_3_1_0()); }
{ before(grammarAccess.getParameterArrayTypeAccess().getDefaultParameterListParserRuleCall_2_1_0()); }
ruleParameterList
{ after(grammarAccess.getParameterArrayTypeAccess().getDefaultParameterListParserRuleCall_3_1_0()); }
{ after(grammarAccess.getParameterArrayTypeAccess().getDefaultParameterListParserRuleCall_2_1_0()); }
)
;
finally {
Expand Down
Loading

0 comments on commit 8976943

Please sign in to comment.