Commit a06cebcb authored by Philip Makedonski's avatar Philip Makedonski Committed by Philip Makedonski
Browse files

+ cleanup, reordering

parent 7d67a762

plugins/Prototypes/org.etsi.mts.tdl.txi/src/org/etsi/mts/tdl/TDLtxi.xtext

+32 −49
Original line number Diff line number Diff line
@@ -49,17 +49,6 @@ terminal END: 'synthetic:END'; // decrease indentation 


//# Foundation



@Override

PackageableElement returns tdl::PackageableElement:

    super

    | Entity 

    | Event 

    | PICS

    | StructuredTestObjective

    | EventSpecificationTemplate

    | TestPurposeDescription

;



Entity returns to::Entity:

    AnnotationCommentFragment

    'Entity' name=Identifier
@@ -203,6 +192,34 @@ ThenAnnotation returns tdl::Annotation: 
;





//## Element: Abstract 

fragment InitialConditionsFragment returns tdl::Element:

    annotation+=InitialConditionsAnnotation 

;



fragment ExpectedBehaviourFragment returns tdl::Element:

    annotation+=ExpectedBehaviourAnnotation 

;



fragment FinalConditionsFragment returns tdl::Element:

    annotation+=FinalConditionsAnnotation 

;



fragment ElementAndOrPrefix returns tdl::Element:

    comment+=AndOrQualifier

;



@Override

PackageableElement returns tdl::PackageableElement:

    super

    | Entity 

    | Event 

    | PICS

    | StructuredTestObjective

    | EventSpecificationTemplate

    | TestPurposeDescription

;



//# Test Objective



StructuredTestObjective returns to::StructuredTestObjective:
@@ -621,8 +638,6 @@ VariantBindingPredefined returns to::VariantBinding: 


//# Test Description

TestPurposeDescription returns tdl::TestDescription:

    //TDPrefixFragment

    //TODO: annotation / comment fragment

    annotation+=TestPurposeDescriptionAnnotation

    //TODO: locally ordered?

    //('TestDescription' | isLocallyOrdered?='Test')
@@ -637,8 +652,6 @@ TestPurposeDescription returns tdl::TestDescription: 
;



TPDBehaviourDescription returns tdl::BehaviourDescription:

    //TODO: any behaviour?

    //TODO: annotation to determine syntax?

    behaviour=TPDCompoundBehaviour

;
@@ -648,8 +661,6 @@ TPDCompoundBehaviour returns tdl::CompoundBehaviour: 


InitialConditionsBehaviour returns tdl::CompoundBehaviour:

    annotation+=InitialConditionsAnnotation

    //TODO: with annotation?

//    'with' block=AtomicBehaviourBlock

    'with' block=Block

;
@@ -666,26 +677,22 @@ ExpectedBehaviourBehaviour returns tdl::CompoundBehaviour: 


FinalConditionsBehaviour returns tdl::CompoundBehaviour:

    annotation+=FinalConditionsAnnotation

//    'with' block=AtomicBehaviourBlock

    'with' block=Block

;





WhenBehaviour returns tdl::CompoundBehaviour:

    annotation+=WhenAnnotation

//    block=AtomicBehaviourBlock

    block=Block

;



ThenBehaviour returns tdl::CompoundBehaviour:

    annotation+=ThenAnnotation

//    block=AtomicBehaviourBlock

    block=Block

;



TPDBlock returns tdl::Block:

    //no guard

//    ('[' guard+=LocalExpression (',' guard+=LocalExpression)* ']')?

    //NOTE: No guard

    (behaviour+=InitialConditionsBehaviour)? 

    (behaviour+=ExpectedBehaviourBehaviour)? 

    (behaviour+=FinalConditionsBehaviour)?
@@ -743,26 +750,6 @@ TPDTargetMessage returns tdl::Target: 






//## Auxiliary

//TODO: redistribute where applicable



//## Element: Abstract 

fragment InitialConditionsFragment returns tdl::Element:

    annotation+=InitialConditionsAnnotation 

;



fragment ExpectedBehaviourFragment returns tdl::Element:

    annotation+=ExpectedBehaviourAnnotation 

;



fragment FinalConditionsFragment returns tdl::Element:

    annotation+=FinalConditionsAnnotation 

;



fragment ElementAndOrPrefix returns tdl::Element:

    comment+=AndOrQualifier

;



//## ValueConverter Rules (Pseudo-terminals)



Assignments returns ecore::EString:
@@ -802,10 +789,6 @@ Then returns ecore::EString: 
    'then'

;



MIdentifier returns ecore::EString:

    ID (ID)*

;



SIdentifier returns ecore::EString:

    STRING

;