From cdecf96f33a62c50bdea1b5ff1ef5ed48b3a605e Mon Sep 17 00:00:00 2001
From: Philip Makedonski <makedonski@informatik.uni-goettingen.de>
Date: Wed, 12 Jan 2022 17:57:39 +0100
Subject: [PATCH] + minor fixes (ordering, spacing, consistency, time
out->timeout, TestDesc -> Test Desc)
---
.../src/org/etsi/mts/tdl/TDLtx.xtext | 26 +++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/plugins/Prototypes/org.etsi.mts.tdl.tx/src/org/etsi/mts/tdl/TDLtx.xtext b/plugins/Prototypes/org.etsi.mts.tdl.tx/src/org/etsi/mts/tdl/TDLtx.xtext
index 93d65afe..7daa37fa 100644
--- a/plugins/Prototypes/org.etsi.mts.tdl.tx/src/org/etsi/mts/tdl/TDLtx.xtext
+++ b/plugins/Prototypes/org.etsi.mts.tdl.tx/src/org/etsi/mts/tdl/TDLtx.xtext
@@ -190,7 +190,7 @@ StructuredDataInstance returns tdl::StructuredDataInstance:
AnnotationCommentFragment
dataType=[tdl::DataType|Identifier]
name=Identifier
- (unassignedMember=UnassignedMemberTreatment)?
+ ('<' unassignedMember=UnassignedMemberTreatment '>')?
LParen (memberAssignment+=MemberAssignment (',' memberAssignment+=MemberAssignment)*)? RParen
;
@@ -454,9 +454,15 @@ DataElementUse returns tdl::DataElementUse:
//instance x x x
(
- //anonymous - split in case of problems
-// (ParameterBindingFragment | CollectionItemFragment)
-// ) | (
+// //anonymous - split in case of problems
+//// (ParameterBindingFragment | CollectionItemFragment)
+//// ) | (
+ //instance
+ dataElement=[tdl::NamedElement|Identifier]
+ UnassignedFragmentNamedElement?
+ ParameterBindingFragment?
+ ReductionFragment
+ ) | (
//type / anonymous (simplified, avoid duplication, otherwise remove "?")
//DONE: empty parameters / collections? -> added
//DONE: support simple data types as well? -> use any value instead
@@ -469,12 +475,6 @@ DataElementUse returns tdl::DataElementUse:
)?
UnassignedFragmentNamedElement?
(ParameterBindingFragment | CollectionItemFragment)
- ) | (
- //instance
- dataElement=[tdl::NamedElement|Identifier]
- UnassignedFragmentNamedElement?
- ParameterBindingFragment?
- ReductionFragment
)
;
@@ -559,7 +559,7 @@ TimerStop returns tdl::TimerStop:
TimeOut returns tdl::TimeOut:
AtomicPrefixFragment
- 'time' 'out' 'on' componentInstance=[tdl::ComponentInstance|Identifier]
+ 'timeout' 'on' componentInstance=[tdl::ComponentInstance|Identifier]
'::' timer=[tdl::Timer|Identifier]
;
@@ -636,7 +636,7 @@ TestConfiguration returns tdl::TestConfiguration:
TestDescription returns tdl::TestDescription:
TDPrefixFragment
- ('TestDescription' | isLocallyOrdered?='Test')
+ ('Test' 'Description' | isLocallyOrdered?='Test')
name=Identifier
(LParen formalParameter+=FormalParameter ( ',' formalParameter+=FormalParameter)* RParen )?
'uses' testConfiguration=[tdl::TestConfiguration|Identifier]
@@ -650,7 +650,7 @@ fragment TDPrefixFragment returns tdl::TestDescription:
fragment TDObjectiveFragment returns tdl::TestDescription:
'Objective:' testObjective+=[tdl::TestObjective|Identifier]
- ( ',' testObjective+=[tdl::TestObjective|Identifier])*
+ ( ',' testObjective+=[tdl::TestObjective|Identifier])*
;
--
GitLab