[DoNetMerge] Allow the definition of unordered lists

Author: ipa-nhg

plugins/de.fraunhofer.ipa.componentInterface.xtext/src/de/fraunhofer/ipa/componentInterface/ComponentInterface.xtext

@@ -12,13 +12,13 @@ ComponentInterface returns ComponentInterface:
 		'name' name=EString
 		('NameSpace' NameSpace=EString)?
 		('FromRosNode' FromRosNode=[ros::Node|EString])?
-		('RosPublishers' '{' rospublisher+=RosPublisher ( "," rospublisher+=RosPublisher)* '}' )?
-		('RosSubscribers' '{' rossubscriber+=RosSubscriber ( "," rossubscriber+=RosSubscriber)* '}' )?
-		('RosSrvServers' '{' rosserviceserver+=RosServiceServer ( "," rosserviceserver+=RosServiceServer)* '}' )?
-		('RosSrvClients' '{' rosserviceclient+=RosServiceClient ( "," rosserviceclient+=RosServiceClient)* '}' )?
-		('RosActionServers' '{' rosactionserver+=RosActionServer ( "," rosactionserver+=RosActionServer)* '}' )?
-		('RosActionClients' '{' rosactionclient+=RosActionClient ( "," rosactionclient+=RosActionClient)* '}' )?
-		('RosParameters' '{' rosparameter+=RosParameter ( "," rosparameter+=RosParameter)* '}' )?
+		(('RosPublishers' '{' rospublisher+=RosPublisher ( "," rospublisher+=RosPublisher)* '}' )? &
+		('RosSubscribers' '{' rossubscriber+=RosSubscriber ( "," rossubscriber+=RosSubscriber)* '}' )? &
+		('RosSrvServers' '{' rosserviceserver+=RosServiceServer ( "," rosserviceserver+=RosServiceServer)* '}' )? &
+		('RosSrvClients' '{' rosserviceclient+=RosServiceClient ( "," rosserviceclient+=RosServiceClient)* '}' )? &
+		('RosActionServers' '{' rosactionserver+=RosActionServer ( "," rosactionserver+=RosActionServer)* '}' )? &
+		('RosActionClients' '{' rosactionclient+=RosActionClient ( "," rosactionclient+=RosActionClient)* '}' )? &
+		('RosParameters' '{' rosparameter+=RosParameter ( "," rosparameter+=RosParameter)* '}' )?)
 	'}';
 
 

plugins/de.fraunhofer.ipa.ros.xtext/src/de/fraunhofer/ipa/ros/Ros.xtext

@@ -110,12 +110,12 @@ Node returns Node:
 	'Node'
 	'{'
 		'name' name=RosNames
-		('ServiceServers' '{' serviceserver+=ServiceServer ( "," serviceserver+=ServiceServer)* '}')?
-		('Publishers' '{' publisher+=Publisher ( "," publisher+=Publisher)* '}')?
-		('Subscribers' '{' subscriber+=Subscriber ( "," subscriber+=Subscriber)* '}')?
-		('ServiceClients' '{' serviceclient+=ServiceClient ( "," serviceclient+=ServiceClient)* '}')?
-		('ActionServers' '{' actionserver+=ActionServer ( "," actionserver+=ActionServer)* '}')?
-		('ActionClients' '{' actionclient+=ActionClient ( "," actionclient+=ActionClient)* '}' )?
+		(('Publishers' '{' publisher+=Publisher ( "," publisher+=Publisher)* '}')? & 
+		('Subscribers' '{' subscriber+=Subscriber ( "," subscriber+=Subscriber)* '}')? &
+		('ServiceServers' '{' serviceserver+=ServiceServer ( "," serviceserver+=ServiceServer)* '}')? &
+		('ServiceClients' '{' serviceclient+=ServiceClient ( "," serviceclient+=ServiceClient)* '}')? &
+		('ActionServers' '{' actionserver+=ActionServer ( "," actionserver+=ActionServer)* '}')? &
+		('ActionClients' '{' actionclient+=ActionClient ( "," actionclient+=ActionClient)* '}' )? &
 		('Parameters' '{' parameter+=Parameter ( "," parameter+=Parameter)* '}' )?
 	'}';
 

plugins/de.fraunhofer.ipa.rossystem.xtext/src/de/fraunhofer/ipa/rossystem/RosSystem.xtext

@@ -13,11 +13,11 @@ RosSystem returns RosSystem:
 	'RosSystem'
 	'{'
 		'Name' Name=EString
-		('RosComponents' '(' (RosComponent+=ComponentInterface ( "," RosComponent+=ComponentInterface)*)? ')' )?
-		('TopicConnections' '{' (TopicConnections+=TopicConnection ( "," TopicConnections+=TopicConnection)*)? '}' )?
-		('ServiceConnections' '{' (ServiceConnections+=ServiceConnection ( "," ServiceConnections+=ServiceConnection)*)? '}' )?
-		('ActionConnections' '{' (ActionConnections+=ActionConnection ( "," ActionConnections+=ActionConnection)*)? '}' )?
-		('Parameters' '{' (Parameter+=Parameter ( "," Parameter+=Parameter)*)? '}' )?
+		(('RosComponents' '(' (RosComponent+=ComponentInterface ( "," RosComponent+=ComponentInterface)*)? ')' )? &
+		('TopicConnections' '{' (TopicConnections+=TopicConnection ( "," TopicConnections+=TopicConnection)*)? '}' )? &
+		('ServiceConnections' '{' (ServiceConnections+=ServiceConnection ( "," ServiceConnections+=ServiceConnection)*)? '}' )? &
+		('ActionConnections' '{' (ActionConnections+=ActionConnection ( "," ActionConnections+=ActionConnection)*)? '}' )? &
+		('Parameters' '{' (Parameter+=Parameter ( "," Parameter+=Parameter)*)? '}' )?)
 
 
 	'}';