+ grammar alignment for part 4 + other fixes, #208

     | ComponentType | GateType 

     | TestConfiguration 

     | TestDescription

     | TestPurposeDescription

     | TestVariantDescription

    //Part 4

    | Entity 

    | Event 

    | PICS

    | StructuredTestObjective

    | EventSpecificationTemplate

    | TestPurposeDescription

    | TestVariantDescription

    //Part 7

    | ExtendedTestConfiguration

    )

//CollectionDataType

CollectionDataType returns tdl::CollectionDataType:

    AnnotationCommentFragment

    PIXITAnnotationFragment?

    'Collection' name=Identifier

    ConstraintFragment

    'of' itemType=[tdl::DataType|Identifier]

//CollectionDataInstance

CollectionDataInstance returns tdl::CollectionDataInstance:

    AnnotationCommentFragment

    PIXITAnnotationFragment?

    dataType=[tdl::DataType|Identifier] 

    name=Identifier

    (unassignedMember=UnassignedMemberTreatment)?

    | PredefinedIdentifierAnd

    | PredefinedIdentifierEquality

    | PredefinedIdentifierRelational

    | PredefinedIdentifierAdditive

    | PredefinedIdentifierMultiplicative

;

    | LParen DataUse RParen

;

//no longer used

fragment ReductionFragment returns tdl::DataUse:

    (reduction+=MemberReference)+

;

	CheckFragment?

;

CastDataUse returns tdl::CastDataUse:

	LParen

	//TODO: switch to 'from' keword?

    '<' dataType=[tdl::DataType|Identifier] '>'

    //dataType=[tdl::DataType|Identifier] 'from' 

	dataUse=DataUse

	//TODO: causes ambiguity

//	'as' dataType=[tdl::DataType|Identifier]

    RParen

	ParameterBindingFragment?

	// ReductionFragment now handled by PostfixExpression

;

//DynamicDataUse

DynamicDataUse returns tdl::DynamicDataUse:

    FunctionCall

    // ReductionFragment now handled by PostfixExpression

;

//TODO: towards scoped components

VariableUseAssignment returns tdl::VariableUse:

    (componentInstance=[tdl::ComponentInstance|Identifier] '::')? 

    variable=[tdl::Variable|Identifier]

;

//PredefinedFunctionCall

//no longer used

PredefinedFunctionCall returns tdl::PredefinedFunctionCall:

    PredefinedFunctionCallSize

    | PredefinedFunctionCallNot

    LParen actualParameters+=DataUse RParen

;

//no longer used

PredefinedFunctionCallNot returns tdl::PredefinedFunctionCall:

    function=[tdl::PredefinedFunction|PredefinedIdentifierNot]

    LParen actualParameters+=DataUse RParen

;

//no longer used

PredefinedFunctionCallMinus returns tdl::PredefinedFunctionCall:

    function=[tdl::PredefinedFunction|PredefinedIdentifierMinus]

    actualParameters+=DataUseWrapped

;

//no longer used

PredefinedFunctionCallBinary returns tdl::PredefinedFunctionCall:

    //Note: necessary to avoid left recursion

    LParen

    RParen

;

//DataElementUse

DataElementUse returns tdl::DataElementUse:

    {tdl::DataElementUse}

    (

    '[' (item+=DataUse (',' item+=DataUse)*)? ']'

;

//CastDataUse

//Void.

//no longer used

CastDataUse returns tdl::CastDataUse:

	LParen

	//TODO: switch to 'from' keword?

    '<' dataType=[tdl::DataType|Identifier] '>'

    //dataType=[tdl::DataType|Identifier] 'from' 

	dataUse=DataUse

	//TODO: causes ambiguity

//	'as' dataType=[tdl::DataType|Identifier]

    RParen

	ParameterBindingFragment?

	// ReductionFragment now handled by PostfixExpression

;

//# Time

    'as' role=ComponentInstanceRole

;

//ComponentInstanceRole

enum ComponentInstanceRole returns tdl::ComponentInstanceRole:

    SUT = 'SUT' | Tester = 'Tester'

;

    | TestVariantDescriptionName

    | PICSName

    | PIXITName

    | 'when' | 'then' | 'check' | 'where'

    | When

    | Then 

    | CheckIdentifier

;

CheckIdentifier:

//# Foundation

//Entity

Entity returns to::Entity:

    AnnotationCommentFragment

    'Entity' name=TOIdentifier

;

//Event

Event returns to::Event:

    AnnotationCommentFragment

    //DONE: extend identifiers with STRING or multi-word value converters?

    'Event' name=KIdentifier

;

//PICS

PICS returns to::PICS:

    AnnotationCommentFragment

    PICSName name=TOIdentifier

//DONE: See above regarding multiwords.. -> partially resolved

//DONE: Add predefined annotations for Blocks and Behaviours?

//Comment

Qualifier returns tdl::Comment:

    body=(TOIdentifier | NIdentifier) //DONE: Numbers as well? -> yes! Strings as well?? -> not for now!

;

    | body='some'

;

//no longer used

ReferenceQualifier returns tdl::Comment:

    body=References

;

//      but also likely removing the formatting?

//      - also it will likely cause some conflicts, 

//      so it shall be used carefully where it makes sense only

//not used yet?

TimeConstraintQualifierRefined returns tdl::Comment:

    body=TimeConstraintKeyword

;

    'before' | 'after' | 'during' | 'within'

;

//AnnotationType

//Void.

//TODO: this may need to be pulled to TX..

//TODO: quite a bit contrived.. -> may be restricted to TO... (separate editor?)

//@Override

//AnnotationType returns tdl::AnnotationType:

//    'Annotation' name = (

//        Identifier 

//        | InitialBlockName 

//        | ExpectedBlockName 

//        | FinalBlockName 

//        | TestPurposeDescriptionName

//        | When

//        | Then

//    )

//;

//Annotation

InitialConditionsAnnotation returns tdl::Annotation:

    key=[tdl::AnnotationType|InitialBlockName]

;

    key=[tdl::AnnotationType|PICSName]

;

//PackageableElement//@Override

//PackageableElement returns tdl::PackageableElement:

//    super

//    | Entity 

//    | Event 

//    | PICS

//    | StructuredTestObjective

//    | EventSpecificationTemplate 

//;

//## Element: Abstract 

//Element

fragment InitialConditionsFragment returns tdl::Element:

    annotation+=InitialConditionsAnnotation 

;

    comment+=AndOrQualifier

;

//@Override

//PackageableElement returns tdl::PackageableElement:

//    super

//    | Entity 

//    | Event 

//    | PICS

//    | StructuredTestObjective

//    | EventSpecificationTemplate

//    | TestPurposeDescription

//    | ExtendedTestConfiguration

//;

//# Test Objective

//StructuredTestObjective

StructuredTestObjective returns to::StructuredTestObjective:

    'Test' 'Purpose' name=TOIdentifier

    'Test' 'Purpose' name=TOIdentifier '@' 'TPLan3' 

    BEGIN

        ('Objective' ':' description=EString)?

        ('Reference' ':' objectiveURI+=EString (',' objectiveURI+=EString )*)?

    END

;

//PICSReference

FirstPICSReference returns to::PICSReference :

    (comment+=NotQualifier)?

    pics=[to::PICS|TOIdentifier]

    pics=[to::PICS|TOIdentifier]

; 

//InitialConditions

InitialConditions returns to::InitialConditions:

    InitialConditionsFragment

    'with' conditions=EventSequence 

;

//ExpectedBehaviour

ExpectedBehaviour returns to::ExpectedBehaviour:

    //DONE: are the event sequences mapped to distinct behaviours? -> initially no? perhaps yes?

    //DONE: it will mean that the event sequence will be annotated.. -> not at present  

    )

;

//FinalConditions

FinalConditions returns to::FinalConditions:

    FinalConditionsFragment

    'with' conditions=EventSequence 

//# Events

//EventSequence

EventSequence returns to::EventSequence:

    BEGIN 

        (RepeatedEventSequence | SimpleEventSequence)

    events+=FirstEventOccurrence (events+=EventOccurrence)*

;

//RepeatedEventSequence

RepeatedEventSequence returns to::RepeatedEventSequence:

    'repeat'

    (

    END

;

//EventOccurrence

FirstEventOccurrence returns to::EventOccurrence:

	EventOccurrenceFragment

;

    )    

;

//no longer used

fragment EventTimingSuffix returns to::EventOccurrence:

    'with'

    BEGIN

    END

;

//no longer used

fragment EventTimeLabelFragment returns to::EventOccurrence:

    timeLabel=TimeLabel 

;

//no longer used

fragment EventTimeConstraintFragment returns to::EventOccurrence:

    LBrace timeConstraint+=TimeConstraint ( ',' timeConstraint+=TimeConstraint)* RBrace

;

PrefixTimeLabel returns tdl::TimeLabel:

    {tdl::TimeLabel}

    '(.)' 'at' 'time' 'point'

    name=TOIdentifier

;

PrefixTimeConstraint returns tdl::TimeConstraint:

    {tdl::TimeConstraint}

    '(!)' 

    (comment+=Qualifier)*

    comment+=TimeConstraintQualifier

    //TODO: ambiguity

//    (comment+=(Qualifier | CommonWordQualifier | ArticleQualifier))*

    timeConstraintExpression=DataUse

;

//EventOccurrenceSpecification

EventOccurrenceSpecification returns to::EventOccurrenceSpecification:

    entityReference=EntityReference?

    eventReference=EventReference

    CommentFragment?

;

//EntityReference

EntityReference returns to::EntityReference:

    EntityReferenceFragment

;

    )

;

//EventReference

EventReference returns to::EventReference:

    (comment+=Qualifier | comment+=CommonWordQualifier | comment+=NotQualifier)*

    event=[to::Event|KIdentifier] 

//# Data

//Value

Value returns to::Value:

    LiteralValue 

    | DataReference 

    | LiteralValueReferenceArgument

;

LiteralOrDataReferenceAsBinding returns to::Value:

    LiteralValueAsBinding | DataReferenceAsBinding

;

fragment ValueReferenceFragment returns to::Value:

    comment+=NotQualifier?

    comment+=AssignmentQualifier

;

LiteralOrDataReferenceAsBinding returns to::Value:

    LiteralValueAsBinding | DataReferenceAsBinding

;

//LiteralValue

LiteralValue returns to::LiteralValue:

    comment+=NotQualifier?

    comment+=AssignmentQualifier

    )?

;

//Content

DataContent returns to::Content:

    comment+=NotQualifier?

//    (parameter=[Parameter|Identifier] | name=Identifier | name=NumberAsIdentifier)

    )?

; 

//LiteralValueReference

LiteralValueReference returns to::LiteralValueReference:

    ValueReferenceFragment

    LiteralValueReferenceFragment

    content=[to::LiteralValue|TOIdentifier]

;

//ContentReference

ContentReference returns to::ContentReference:

    ValueReferenceFragment

    ContentReferenceFragment

    content=[to::Content|TOIdentifier]

;

//DataReference

DataReference returns to::DataReference:

    //TODO: is this still needed? causes ambiguity..

    //        -> does not seem to be the case, perhaps for typed?! -> likely not

    content=TODataElementUse

;

TODataElementUse returns tdl::DataElementUse:

    dataElement=[tdl::NamedElement|TOIdentifier]

    //UnassignedFragmentNamedElement?

	(TOParameterBindingFragment | TOCollectionItemFragment | TOMemberReferenceFragment)? 

	//ReductionFragment?

	//TODO: for some reason the fragment breaks serialisation..

	//(reduction+=MemberReference)*

	//->CollectionItemFragment?

	//CheckFragment?

//DataUse

TODataUse returns tdl::DataUse:

	TODataElementUse | LiteralValueUse | SpecialValueUse

;

fragment TOParameterBindingFragment returns tdl::DataUse:

    'containing' BEGIN argument+=TOParameterBinding ( ',' argument+=TOParameterBinding)* END

;

fragment TOCollectionItemFragment returns tdl::DataElementUse:

    'containing' BEGIN item+=TODataElementUse (',' item+=TODataElementUse)* END

;

fragment TOMemberReferenceFragment returns tdl::DataUse:

    (reduction+=TOMemberReference)+

;

//MemberReference

TOMemberReference returns tdl::MemberReference:

    ('.' member=[tdl::Member|ParameterIdentifier])

    |

    ('.' 'get' LParen collectionIndex=TODataUse RParen)

;

//ParameterBinding

TOParameterBinding returns tdl::ParameterBinding:

    parameter=[tdl::Parameter|TOIdentifier]

    comment+=AssignmentQualifier

	dataUse=TODataUse

;

TODataUse returns tdl::DataUse:

	TODataElementUse | TOLiteralValueUse | SpecialValueUse

//DataElementUse

TODataElementUse returns tdl::DataElementUse:

    dataElement=[tdl::NamedElement|TOIdentifier]

    //UnassignedFragmentNamedElement?

	(TOParameterBindingFragment | TOCollectionItemFragment | TOMemberReferenceFragment)? 

	//ReductionFragment?

	//TODO: for some reason the fragment breaks serialisation..

	//(reduction+=MemberReference)*

	//->CollectionItemFragment?

	//CheckFragment?

;

TOLiteralValueUse returns tdl::LiteralValueUse:

    (value=STRING | intValue=BIGINTEGER | boolValue=BOOLEAN)

fragment TOCollectionItemFragment returns tdl::DataElementUse:

    'containing' BEGIN item+=TODataElementUse (',' item+=TODataElementUse)* END

;

//# Time

//TimeLabel

PrefixTimeLabel returns tdl::TimeLabel:

    {tdl::TimeLabel}

    '(.)' 'at' 'time' 'point'

    name=TOIdentifier

;

//TimeConstraint

PrefixTimeConstraint returns tdl::TimeConstraint:

    {tdl::TimeConstraint}

    '(!)' 

    (comment+=Qualifier)*

    comment+=TimeConstraintQualifier

    //TODO: ambiguity

//    (comment+=(Qualifier | CommonWordQualifier | ArticleQualifier))*

    timeConstraintExpression=DataUse

;

//# Event Templates

//EventSpecificationTemplate

EventSpecificationTemplate returns to::EventSpecificationTemplate:

    AnnotationCommentFragment

    'Template' name=TOIdentifier

    END

;

//EventTemplateOccurrence

FirstEventTemplateOccurrence returns to::EventTemplateOccurrence:

    EventTemplateOccurrenceFragment

;

    CommentFragment?

;

//EntityBinding

EntityBinding returns to::EntityBinding:

    templateEntity=EntityReference

    'replaced' 'by'

//# Structured Test Objective Variants

//StructuredTestObjectiveVariant

Variant returns to::TestObjectiveVariant:

    'Variant' name=TOIdentifier

    BEGIN

    END

;

//Variants

Variants returns to::Variants:

    variants+=Variant+

    WithCommentFragment?

;

//VariantBinding

VariantBinding returns to::VariantBinding:

    VariantBindingValue

    | VariantBindingAttribute 

;

//# Test Description

//TestDescription

TestPurposeDescription returns tdl::TestDescription:

    annotation+=TestPurposeDescriptionAnnotation

    //TODO: locally ordered?

    END

;

//TODO: distribute below

TestVariantDescription returns tdl::TestDescription:

    annotation+=TestVariantDescriptionAnnotation

    //TODO: locally ordered?

    //('TestDescription' | isLocallyOrdered?='Test')

    name=TOIdentifier

    //TODO: parameters?

    (LParen formalParameter+=FormalParameter ( ',' formalParameter+=FormalParameter)* RParen )?

    //TODO: Reference, PICS?, Objective reference vs Objective inline (all annotations?) or simply defer to objective

//	(behaviourDescription=TVDBehaviourDescription)

    BEGIN

        TDObjectiveFragment?

        //TODO: why is configuration not serialised?!

    END

;

TVDBehaviourDescription returns tdl::BehaviourDescription:

    behaviour=TVDCompoundBehaviour

;

TVDCompoundBehaviour returns tdl::CompoundBehaviour:

    //(annotation+=PICSAnnotation ':')?

    block=TVDBlock

;

TVDBlock returns tdl::Block:

    //NOTE: No guard -> guard is PICS

    //TODO: annotation has to be pulled up? or pushed down?

    //TODO: Objective

    (annotation+=PICSAnnotation ':' guard+=LocalExpression)?

    behaviour+=VariantBehaviour 

//BehaviourDescription

TPDBehaviourDescription returns tdl::BehaviourDescription:

    behaviour=TPDCompoundBehaviour

;

VariantBehaviour returns tdl::TestDescriptionReference:

    'Bindings' ':' testDescription=[tdl::TestDescription|DeclName]

    (BEGIN 

    	argument+=ParameterBinding 

    	( ',' argument+=ParameterBinding)* 

	END)?

	//TODO: skip / merge above

    ('with' BEGIN

        componentInstanceBinding+=ComponentInstanceBinding 

        (',' componentInstanceBinding+=ComponentInstanceBinding)*

    END)?

TVDBehaviourDescription returns tdl::BehaviourDescription:

    behaviour=TVDCompoundBehaviour

;

TPDBehaviourDescription returns tdl::BehaviourDescription:

    behaviour=TPDCompoundBehaviour

;

//CompoundBehaviour

TPDCompoundBehaviour returns tdl::CompoundBehaviour:

    //(annotation+=PICSAnnotation ':')?

    block=TPDBlock

    block=Block

;

TVDCompoundBehaviour returns tdl::CompoundBehaviour:

    //(annotation+=PICSAnnotation ':')?

    block=TVDBlock

;

//Block

TPDBlock returns tdl::Block:

    //NOTE: No guard -> guard is PICS

    //TODO: annotation has to be pulled up? or pushed down?

    behaviour+=ThenBehaviour 

;

TVDBlock returns tdl::Block:

    //NOTE: No guard -> guard is PICS

    //TODO: annotation has to be pulled up? or pushed down?

    //TODO: Objective

    (annotation+=PICSAnnotation ':' guard+=LocalExpression)?

    behaviour+=VariantBehaviour 

;

//TestDescriptionReference

VariantBehaviour returns tdl::TestDescriptionReference:

    'Bindings' ':' testDescription=[tdl::TestDescription|DeclName]

    (BEGIN 

    	argument+=ParameterBinding 

    	( ',' argument+=ParameterBinding)* 

	END)?

	//TODO: skip / merge above

    ('with' BEGIN

        componentInstanceBinding+=ComponentInstanceBinding 

        (',' componentInstanceBinding+=ComponentInstanceBinding)*

    END)?

;

;

TestPurposeDescriptionName:

    'Test' 'Purpose' 'Description'

    'Test' 'Purpose'

;

TestVariantDescriptionName: