Merge preparation: integration of open PR and regeneration

Author: ipa-nhg

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

@@ -36,7 +36,7 @@
 'ServiceSpec'=53
 'Specs'=47
 'String'=28
-'Struc'=88
+'Struct'=88
 'Subscriber'=76
 'Subscribers'=64
 'TopicSpec'=56

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

@@ -22,7 +22,7 @@
 @SuppressWarnings("all")
 public class InternalRosParser extends AbstractInternalContentAssistParser {
     public static final String[] tokenNames = new String[] {
-        "<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'", "'Specs'", "'artifact'", "'Artifact'", "'CatkinPackage'", "'dependency'", "'Dependencies'", "'ServiceSpec'", "'request'", "'response'", "'TopicSpec'", "'ActionSpec'", "'Node'", "'serviceserver'", "'ServiceServers'", "'publisher'", "'Publishers'", "'subscriber'", "'Subscribers'", "'serviceclient'", "'ServiceClients'", "'actionserver'", "'ActionServers'", "'actionclient'", "'ActionClients'", "'parameter'", "'Parameters'", "'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[]'", "'[]'"
+        "<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'", "'Specs'", "'artifact'", "'Artifact'", "'CatkinPackage'", "'dependency'", "'Dependencies'", "'ServiceSpec'", "'request'", "'response'", "'TopicSpec'", "'ActionSpec'", "'Node'", "'serviceserver'", "'ServiceServers'", "'publisher'", "'Publishers'", "'subscriber'", "'Subscribers'", "'serviceclient'", "'ServiceClients'", "'actionserver'", "'ActionServers'", "'actionclient'", "'ActionClients'", "'parameter'", "'Parameters'", "'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[]'", "'[]'"
     };
     public static final int T__50=50;
     public static final int RULE_DATE_TIME=8;
@@ -40199,21 +40199,21 @@ public final void rule__ParameterStructType__Group__1() throws RecognitionExcept
 
 
     // $ANTLR start "rule__ParameterStructType__Group__1__Impl"
-    // InternalRos.g:13178:1: rule__ParameterStructType__Group__1__Impl : ( 'Struc' ) ;
+    // InternalRos.g:13178:1: rule__ParameterStructType__Group__1__Impl : ( 'Struct' ) ;
     public final void rule__ParameterStructType__Group__1__Impl() throws RecognitionException {
 
         		int stackSize = keepStackSize();
 
         try {
-            // InternalRos.g:13182:1: ( ( 'Struc' ) )
-            // InternalRos.g:13183:1: ( 'Struc' )
+            // InternalRos.g:13182:1: ( ( 'Struct' ) )
+            // InternalRos.g:13183:1: ( 'Struct' )
             {
-            // InternalRos.g:13183:1: ( 'Struc' )
-            // InternalRos.g:13184:2: 'Struc'
+            // InternalRos.g:13183:1: ( 'Struct' )
+            // InternalRos.g:13184:2: 'Struct'
             {
-             before(grammarAccess.getParameterStructTypeAccess().getStrucKeyword_1()); 
+             before(grammarAccess.getParameterStructTypeAccess().getStructKeyword_1()); 
             match(input,88,FOLLOW_2); 
-             after(grammarAccess.getParameterStructTypeAccess().getStrucKeyword_1()); 
+             after(grammarAccess.getParameterStructTypeAccess().getStructKeyword_1()); 
 
             }
 
@@ -56657,4 +56657,4 @@ public String getDescription() {
     public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000008000000L});
     public static final BitSet FOLLOW_99 = new BitSet(new long[]{0x0000000000000000L,0x0800000000000000L});
 
-}
+}

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

@@ -36,7 +36,7 @@
 'ServiceSpec'=39
 'Specs'=32
 'String'=44
-'Struc'=85
+'Struct'=85
 'Subscriber'=70
 'Subscribers'=57
 'TopicSpec'=42