Skip to content
Snippets Groups Projects
Commit cdecf96f authored by Philip Makedonski's avatar Philip Makedonski Committed by Philip Makedonski
Browse files

+ minor fixes (ordering, spacing, consistency, time out->timeout, TestDesc -> Test Desc)

parent bf2ba882
No related branches found
No related tags found
No related merge requests found
......@@ -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])*
;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment