Merge simplified version of the ROS DSL grammar

Author: ipa-nhg

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

@@ -5047,4 +5047,4 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     }
 
 
-}
+}

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

@@ -46060,4 +46060,4 @@ public String getDescription() {
     public static final BitSet FOLLOW_97 = new BitSet(new long[]{0x0000000008000000L});
     public static final BitSet FOLLOW_98 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L});
 
-}
+}

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

@@ -5047,4 +5047,4 @@ public int specialStateTransition(int s, IntStream _input) throws NoViableAltExc
     }
 
 
-}
+}

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

@@ -14619,4 +14619,4 @@ public String getDescription() {
     public static final BitSet FOLLOW_62 = new BitSet(new long[]{0x4100BA0000001030L,0x0000000600040100L});
     public static final BitSet FOLLOW_63 = new BitSet(new long[]{0x0000000000000000L,0x0001000000000000L});
 
-}
+}

plugins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/serializer/RosSemanticSequencer.java

@@ -394,7 +394,7 @@ protected void sequence_ArrayTopicSpecRef(ISerializationContext context, ArrayTo
 	 *     Artifact returns Artifact
 	 *
 	 * Constraint:
-	 *     (name=RosNames (node=Node | node=Node)?)
+	 *     (name=RosNames node=Node?)
 	 */
 	protected void sequence_Artifact(ISerializationContext context, Artifact semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
@@ -407,12 +407,7 @@ protected void sequence_Artifact(ISerializationContext context, Artifact semanti
 	 *     CatkinPackage returns CatkinPackage
 	 *
 	 * Constraint:
-	 *     (
-	 *         name=RosNames 
-	 *         ((spec+=SpecBase spec+=SpecBase*) | (spec+=SpecBase spec+=SpecBase*))? 
-	 *         ((artifact+=Artifact artifact+=Artifact*) | (artifact+=Artifact artifact+=Artifact*))? 
-	 *         ((dependency+=Dependency dependency+=Dependency*) | (dependency+=Dependency dependency+=Dependency*))?
-	 *     )
+	 *     (name=RosNames (spec+=SpecBase spec+=SpecBase*)? (artifact+=Artifact artifact+=Artifact*)? (dependency+=Dependency dependency+=Dependency*)?)
 	 */
 	protected void sequence_CatkinPackage(ISerializationContext context, CatkinPackage semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
@@ -495,13 +490,13 @@ protected void sequence_MessagePart(ISerializationContext context, MessagePart s
 	 * Constraint:
 	 *     (
 	 *         name=RosNames 
-	 *         ((serviceserver+=ServiceServer serviceserver+=ServiceServer*) | (serviceserver+=ServiceServer serviceserver+=ServiceServer*))? 
-	 *         ((publisher+=Publisher publisher+=Publisher*) | (publisher+=Publisher publisher+=Publisher*))? 
-	 *         ((subscriber+=Subscriber subscriber+=Subscriber*) | (subscriber+=Subscriber subscriber+=Subscriber*))? 
-	 *         ((serviceclient+=ServiceClient serviceclient+=ServiceClient*) | (serviceclient+=ServiceClient serviceclient+=ServiceClient*))? 
-	 *         ((actionserver+=ActionServer actionserver+=ActionServer*) | (actionserver+=ActionServer actionserver+=ActionServer*))? 
-	 *         ((actionclient+=ActionClient actionclient+=ActionClient*) | (actionclient+=ActionClient actionclient+=ActionClient*))? 
-	 *         ((parameter+=Parameter parameter+=Parameter*) | (parameter+=Parameter parameter+=Parameter*))?
+	 *         (serviceserver+=ServiceServer serviceserver+=ServiceServer*)? 
+	 *         (publisher+=Publisher publisher+=Publisher*)? 
+	 *         (subscriber+=Subscriber subscriber+=Subscriber*)? 
+	 *         (serviceclient+=ServiceClient serviceclient+=ServiceClient*)? 
+	 *         (actionserver+=ActionServer actionserver+=ActionServer*)? 
+	 *         (actionclient+=ActionClient actionclient+=ActionClient*)? 
+	 *         (parameter+=Parameter parameter+=Parameter*)?
 	 *     )
 	 */
 	protected void sequence_Node(ISerializationContext context, Node semanticObject) {
@@ -533,7 +528,7 @@ protected void sequence_PackageDependency(ISerializationContext context, Package
 	 *     PackageSet returns PackageSet
 	 *
 	 * Constraint:
-	 *     ((package+=Package package+=Package*) | (package+=Package package+=Package*))?
+	 *     (package+=Package package+=Package*)?
 	 */
 	protected void sequence_PackageSet(ISerializationContext context, PackageSet semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
@@ -546,11 +541,7 @@ protected void sequence_PackageSet(ISerializationContext context, PackageSet sem
 	 *     Package_Impl returns Package
 	 *
 	 * Constraint:
-	 *     (
-	 *         name=EString 
-	 *         ((spec+=SpecBase spec+=SpecBase*) | (spec+=SpecBase spec+=SpecBase*))? 
-	 *         ((artifact+=Artifact artifact+=Artifact*) | (artifact+=Artifact artifact+=Artifact*))?
-	 *     )
+	 *     (name=EString (spec+=SpecBase spec+=SpecBase*)? (artifact+=Artifact artifact+=Artifact*)?)
 	 */
 	protected void sequence_Package_Impl(ISerializationContext context, ros.Package semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);