Skip to content

Commit 836bca3

Browse files
ipa-nhgipa-nhg
committed
Correct name of the Struct for the Xtext grammar
1 parent 00f72d4 commit 836bca3

File tree

34 files changed

+702
-698
lines changed

34 files changed

+702
-698
lines changed

‎plugins/de.fraunhofer.ipa.componentInterface.xtext.tests/resources/test.ros‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ PackageSet { package {
1717
Parameter { name double_test type Double},
1818
Parameter {name int_test type Integer},
1919
Parameter {name list_test type List {Integer,Integer,String}},
20-
Parameter {name struc_test type Struc
20+
Parameter {name struc_test type Struct
2121
{first_element Integer ,
2222
second_element List { Integer, String},
2323
third_element String ,
24-
last_element Struc { hola Integer, what String}}
24+
last_element Struct { hola Integer, what String}}
2525
}
2626
}}
27-
}}}}}
27+
}}}}}

‎plugins/de.fraunhofer.ipa.componentInterface.xtext.tests/src/de/fraunhofer/ipa/componentInterface/tests/ComponentInterfaceTestingUtils.xtend‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ class ComponentInterfaceTestingUtils {
5151
Parameter { name double_test type Double},
5252
Parameter {name int_test type Integer},
5353
Parameter {name list_test type List {Integer,Integer,String}},
54-
Parameter {name struc_test type Struc
54+
Parameter {name struc_test type Struct
5555
{first_element Integer ,
5656
second_element List { Integer, String},
5757
third_element String ,
58-
last_element Struc { hola Integer, what String}}
58+
last_element Struct { hola Integer, what String}}
5959
}
6060
}}}}},
6161
CatkinPackage sensor_msgs{ spec {
@@ -70,4 +70,4 @@ class ComponentInterfaceTestingUtils {
7070
return resourceSet
7171
}
7272

73-
}
73+
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10754,9 +10754,9 @@ rule__ParameterStructType__Group__1__Impl
1075410754
}
1075510755
:
1075610756
(
10757-
{ before(grammarAccess.getParameterStructTypeAccess().getStrucKeyword_1()); }
10758-
'Struc'
10759-
{ after(grammarAccess.getParameterStructTypeAccess().getStrucKeyword_1()); }
10757+
{ before(grammarAccess.getParameterStructTypeAccess().getStructKeyword_1()); }
10758+
'Struct'
10759+
{ after(grammarAccess.getParameterStructTypeAccess().getStructKeyword_1()); }
1076010760
)
1076110761
;
1076210762
finally {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
'ServiceServer'=64
2929
'ServiceSpec'=51
3030
'String'=28
31-
'Struc'=79
31+
'Struct'=79
3232
'Subscriber'=67
3333
'TopicSpec'=54
3434
'[]'=114

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

Lines changed: 251 additions & 250 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/InternalRosParser.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
@SuppressWarnings("all")
2323
public class InternalRosParser extends AbstractInternalContentAssistParser {
2424
public static final String[] tokenNames = new String[] {
25-
"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_BINARY", "RULE_BOOLEAN", "RULE_DOUBLE", "RULE_DECINT", "RULE_DATE_TIME", "RULE_STRING", "RULE_ID", "RULE_ROS_CONVENTION_A", "RULE_MESSAGE_ASIGMENT", "RULE_ROS_CONVENTION_PARAM", "RULE_DIGIT", "RULE_DAY", "RULE_MONTH", "RULE_YEAR", "RULE_HOUR", "RULE_MIN_SEC", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'GraphName'", "'node'", "'Header'", "'String'", "'goal'", "'message'", "'result'", "'feedback'", "'name'", "'value'", "'service'", "'type'", "'action'", "'duration'", "'time'", "'PackageSet'", "'{'", "'}'", "'package'", "','", "'Package'", "'spec'", "'artifact'", "'Artifact'", "'CatkinPackage'", "'dependency'", "'ServiceSpec'", "'request'", "'response'", "'TopicSpec'", "'ActionSpec'", "'Node'", "'serviceserver'", "'publisher'", "'subscriber'", "'serviceclient'", "'actionserver'", "'actionclient'", "'parameter'", "'ServiceServer'", "'namespace'", "'Publisher'", "'Subscriber'", "'ServiceClient'", "'ActionServer'", "'ActionClient'", "'PackageDependency'", "'ExternalDependency'", "'GlobalNamespace'", "'parts'", "'RelativeNamespace'", "'PrivateNamespace'", "'Parameter'", "'List'", "'Struc'", "'Integer'", "'default'", "'Double'", "'Boolean'", "'Base64'", "'Array'", "'ParameterAny'", "'ParameterStructMember'", "'bool'", "'int8'", "'uint8'", "'int16'", "'uint16'", "'int32'", "'uint32'", "'int64'", "'uint64'", "'float32'", "'float64'", "'string'", "'byte'", "'bool[]'", "'int8[]'", "'uint8[]'", "'int16[]'", "'uint16[]'", "'int32[]'", "'uint32[]'", "'int64[]'", "'uint64[]'", "'float32[]'", "'float64[]'", "'string[]'", "'byte[]'", "'[]'"
25+
"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_BINARY", "RULE_BOOLEAN", "RULE_DOUBLE", "RULE_DECINT", "RULE_DATE_TIME", "RULE_STRING", "RULE_ID", "RULE_ROS_CONVENTION_A", "RULE_MESSAGE_ASIGMENT", "RULE_ROS_CONVENTION_PARAM", "RULE_DIGIT", "RULE_DAY", "RULE_MONTH", "RULE_YEAR", "RULE_HOUR", "RULE_MIN_SEC", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'GraphName'", "'node'", "'Header'", "'String'", "'goal'", "'message'", "'result'", "'feedback'", "'name'", "'value'", "'service'", "'type'", "'action'", "'duration'", "'time'", "'PackageSet'", "'{'", "'}'", "'package'", "','", "'Package'", "'spec'", "'artifact'", "'Artifact'", "'CatkinPackage'", "'dependency'", "'ServiceSpec'", "'request'", "'response'", "'TopicSpec'", "'ActionSpec'", "'Node'", "'serviceserver'", "'publisher'", "'subscriber'", "'serviceclient'", "'actionserver'", "'actionclient'", "'parameter'", "'ServiceServer'", "'namespace'", "'Publisher'", "'Subscriber'", "'ServiceClient'", "'ActionServer'", "'ActionClient'", "'PackageDependency'", "'ExternalDependency'", "'GlobalNamespace'", "'parts'", "'RelativeNamespace'", "'PrivateNamespace'", "'Parameter'", "'List'", "'Struct'", "'Integer'", "'default'", "'Double'", "'Boolean'", "'Base64'", "'Array'", "'ParameterAny'", "'ParameterStructMember'", "'bool'", "'int8'", "'uint8'", "'int16'", "'uint16'", "'int32'", "'uint32'", "'int64'", "'uint64'", "'float32'", "'float64'", "'string'", "'byte'", "'bool[]'", "'int8[]'", "'uint8[]'", "'int16[]'", "'uint16[]'", "'int32[]'", "'uint32[]'", "'int64[]'", "'uint64[]'", "'float32[]'", "'float64[]'", "'string[]'", "'byte[]'", "'[]'"
2626
};
2727
public static final int T__50=50;
2828
public static final int RULE_DATE_TIME=8;
@@ -32497,21 +32497,21 @@ public final void rule__ParameterStructType__Group__1() throws RecognitionExcept
3249732497

3249832498

3249932499
// $ANTLR start "rule__ParameterStructType__Group__1__Impl"
32500-
// InternalRos.g:10751:1: rule__ParameterStructType__Group__1__Impl : ( 'Struc' ) ;
32500+
// InternalRos.g:10751:1: rule__ParameterStructType__Group__1__Impl : ( 'Struct' ) ;
3250132501
public final void rule__ParameterStructType__Group__1__Impl() throws RecognitionException {
3250232502

3250332503
int stackSize = keepStackSize();
3250432504

3250532505
try {
32506-
// InternalRos.g:10755:1: ( ( 'Struc' ) )
32507-
// InternalRos.g:10756:1: ( 'Struc' )
32506+
// InternalRos.g:10755:1: ( ( 'Struct' ) )
32507+
// InternalRos.g:10756:1: ( 'Struct' )
3250832508
{
32509-
// InternalRos.g:10756:1: ( 'Struc' )
32510-
// InternalRos.g:10757:2: 'Struc'
32509+
// InternalRos.g:10756:1: ( 'Struct' )
32510+
// InternalRos.g:10757:2: 'Struct'
3251132511
{
32512-
before(grammarAccess.getParameterStructTypeAccess().getStrucKeyword_1());
32512+
before(grammarAccess.getParameterStructTypeAccess().getStructKeyword_1());
3251332513
match(input,79,FOLLOW_2);
32514-
after(grammarAccess.getParameterStructTypeAccess().getStrucKeyword_1());
32514+
after(grammarAccess.getParameterStructTypeAccess().getStructKeyword_1());
3251532515

3251632516
}
3251732517

‎plugins/de.fraunhofer.ipa.ros.xtext.tests/resources/test.ros‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ PackageSet { package {
1717
Parameter { name double_test type Double},
1818
Parameter {name int_test type Integer},
1919
Parameter {name list_test type List {Integer,Integer,String}},
20-
Parameter {name struc_test type Struc
20+
Parameter {name struc_test type Struct
2121
{first_element Integer ,
2222
second_element List { Integer, String},
2323
third_element String ,
24-
last_element Struc { hola Integer, what String}}
24+
last_element Struct { hola Integer, what String}}
2525
}
2626
}}
27-
}}}}}
27+
}}}}}

‎plugins/de.fraunhofer.ipa.ros.xtext.tests/resources/test_error.ros‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ PackageSet { package {
1717
Parameter { name double_test type Double},
1818
Parameter {name int_test type Integer},
1919
Parameter {name list_test type List {Integer,Integer,String}},
20-
Parameter {name struc_test type Struc
20+
Parameter {name struc_test type Struct
2121
{first_element Integer ,
2222
second_element List { Integer, String},
2323
third_element String ,
24-
last_element Struc { hola Integer, what String}}
24+
last_element Struct { hola Integer, what String}}
2525
}
2626
}}
27-
}}}}}
27+
}}}}}

‎plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/Ros.xtextbin‎

1 Byte
Binary file not shown.

‎plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/parser/antlr/internal/InternalRos.g‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3139,9 +3139,9 @@ ruleParameterStructType returns [EObject current=null]
31393139
$current);
31403140
}
31413141
)
3142-
otherlv_1='Struc'
3142+
otherlv_1='Struct'
31433143
{
3144-
newLeafNode(otherlv_1, grammarAccess.getParameterStructTypeAccess().getStrucKeyword_1());
3144+
newLeafNode(otherlv_1, grammarAccess.getParameterStructTypeAccess().getStructKeyword_1());
31453145
}
31463146
otherlv_2='{'
31473147
{

0 commit comments

Comments
 (0)