Simplify the grammar of the ROS model DSL

Author: ipa-nhg

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?)
+	 *     (name=RosNames (node=Node | node=Node)?)
 	 */
 	protected void sequence_Artifact(ISerializationContext context, Artifact semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
@@ -407,7 +407,12 @@ protected void sequence_Artifact(ISerializationContext context, Artifact semanti
 	 *     CatkinPackage returns CatkinPackage
 	 *
 	 * Constraint:
-	 *     (name=RosNames (spec+=SpecBase spec+=SpecBase*)? (artifact+=Artifact artifact+=Artifact*)? (dependency+=Dependency dependency+=Dependency*)?)
+	 *     (
+	 *         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*))?
+	 *     )
 	 */
 	protected void sequence_CatkinPackage(ISerializationContext context, CatkinPackage semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
@@ -490,13 +495,13 @@ protected void sequence_MessagePart(ISerializationContext context, MessagePart s
 	 * Constraint:
 	 *     (
 	 *         name=RosNames 
-	 *         (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*)?
+	 *         ((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*))?
 	 *     )
 	 */
 	protected void sequence_Node(ISerializationContext context, Node semanticObject) {
@@ -528,7 +533,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);
@@ -541,7 +546,11 @@ protected void sequence_PackageSet(ISerializationContext context, PackageSet sem
 	 *     Package_Impl returns Package
 	 *
 	 * Constraint:
-	 *     (name=EString (spec+=SpecBase spec+=SpecBase*)? (artifact+=Artifact artifact+=Artifact*)?)
+	 *     (
+	 *         name=EString 
+	 *         ((spec+=SpecBase spec+=SpecBase*) | (spec+=SpecBase spec+=SpecBase*))? 
+	 *         ((artifact+=Artifact artifact+=Artifact*) | (artifact+=Artifact artifact+=Artifact*))?
+	 *     )
 	 */
 	protected void sequence_Package_Impl(ISerializationContext context, ros.Package semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);