Commit 0e1d280b authored by Philip Makedonski's avatar Philip Makedonski Committed by Philip Makedonski
Browse files

+ further cleanup

parent 6450b321

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

+13 −18
Original line number Diff line number Diff line
@@ -67,10 +67,12 @@ Entity returns to::Entity: 


Event returns to::Event:

    AnnotationCommentFragment

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

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

    //        only for select uses (distinct rule) or for the entire grammar?

    //TODO: check how well multi-word value converters work as a separate rule..

    //      -> not in this version

    //DONE: check how well multi-word value converters work as a separate rule..

    //        would it then be a single string or should it be decomposed in a sequence?

    //      -> not in this version

    'Event' name=Identifier

;
@@ -79,17 +81,15 @@ PICS returns to::PICS: 
    'PICS' name=Identifier

;



//# Auxiliary

//# Comments as Qualifiers



//## Qualifiers



//TODO: Group by context?

//TODO: Move elsewhere

//TODO: See above regarding multiwords..

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

//DONE: Group by context? -> no

//DONE: Move elsewhere -> follow document structure

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

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



Qualifier returns tdl::Comment:

    body=(Identifier | NIdentifier) //TODO: Numbers as well? Strings as well??

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

;



NotQualifier returns tdl::Comment:
@@ -105,7 +105,6 @@ ArticleQualifier returns tdl::Comment: 
;



AssignmentQualifier returns tdl::Comment:

    //TODO: avoid keywords with spaces

    body=Assignments

;
@@ -164,7 +163,7 @@ TimeConstraintKeyword returns ecore::EString: 
;





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

//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:
@@ -237,8 +236,8 @@ InitialConditions returns to::InitialConditions: 
;



ExpectedBehaviour returns to::ExpectedBehaviour:

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

    //TODO: it will mean that the event sequence will be annotated..  

    //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  

    ExpectedBehaviourFragment

    'ensure' 'that'

    (
@@ -350,7 +349,6 @@ EventReference returns to::EventReference: 


//# Data



//TODO: continue with data, simplify where appropriate

Value returns to::Value:

    LiteralValue 

    | DataReference
@@ -384,7 +382,6 @@ LiteralValue returns to::LiteralValue: 


LiteralValueAsArgument returns to::LiteralValue:

    (comment+=ArticleQualifier | comment+=QuantifiedQualifier)

//  '(literal)'

    LiteralValueFragment

;
@@ -452,8 +449,6 @@ BindingContentReference returns to::ContentReference: 


fragment ContentReferenceFragment returns to::ContentReference:

    'the' 'value' 'contained' 'in'

    // make more complex: simplify

    // e.g. 

    // (comment+=ArticleQualifier)?

    // (comment+=Qualifier)*

    // (name=Identifier | name='value')