From 11244a844f0e2368adfe2b0deca8e692732dec62 Mon Sep 17 00:00:00 2001 From: ipa-nhg Date: Mon, 31 May 2021 15:01:09 +0200 Subject: [PATCH] [DoNetMerge] Allow the definition of unordered lists --- .../componentInterface/ComponentInterface.xtext | 14 +++++++------- .../src/de/fraunhofer/ipa/ros/Ros.xtext | 12 ++++++------ .../de/fraunhofer/ipa/rossystem/RosSystem.xtext | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/plugins/de.fraunhofer.ipa.componentInterface.xtext/src/de/fraunhofer/ipa/componentInterface/ComponentInterface.xtext b/plugins/de.fraunhofer.ipa.componentInterface.xtext/src/de/fraunhofer/ipa/componentInterface/ComponentInterface.xtext index 4bc8be164..16bb3c2ab 100644 --- a/plugins/de.fraunhofer.ipa.componentInterface.xtext/src/de/fraunhofer/ipa/componentInterface/ComponentInterface.xtext +++ b/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)* '}' )?) '}'; diff --git a/plugins/de.fraunhofer.ipa.ros.xtext/src/de/fraunhofer/ipa/ros/Ros.xtext b/plugins/de.fraunhofer.ipa.ros.xtext/src/de/fraunhofer/ipa/ros/Ros.xtext index fcb04825c..569bb4a30 100644 --- a/plugins/de.fraunhofer.ipa.ros.xtext/src/de/fraunhofer/ipa/ros/Ros.xtext +++ b/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)* '}' )? '}'; diff --git a/plugins/de.fraunhofer.ipa.rossystem.xtext/src/de/fraunhofer/ipa/rossystem/RosSystem.xtext b/plugins/de.fraunhofer.ipa.rossystem.xtext/src/de/fraunhofer/ipa/rossystem/RosSystem.xtext index f0cb5021d..72daa9983 100644 --- a/plugins/de.fraunhofer.ipa.rossystem.xtext/src/de/fraunhofer/ipa/rossystem/RosSystem.xtext +++ b/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)*)? '}' )?) '}';