Commit 0e9bab95 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ grammar refinements (update part 8?)

parent 93b2492b

plugins/org.etsi.mts.tdl.tx/src/org/etsi/mts/tdl/TDLtx.xtext

+11 −8
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ Package returns tdl::Package: 
    AnnotationCommentFragment

    'Package' name=Identifier

    (BEGIN

        (^import+=ElementImport)*

        (packagedElement+=PackageableElement)*

        (nestedPackage+=Package)*

        (^import+=ElementImport//)*

        | packagedElement+=PackageableElement //)*

        | nestedPackage+=Package)*

    END)?

;
@@ -142,7 +142,7 @@ DataResourceMapping returns tdl::DataResourceMapping: 


DataElementMapping returns tdl::DataElementMapping:

    AnnotationCommentFragment

    'Map' mappableDataElement=[tdl::MappableDataElement|Identifier]

    'Map' mappableDataElement=[tdl::MappableDataElement|GRIdentifier]

    ('to' elementURI=EString)?

    'in' dataResourceMapping=[tdl::DataResourceMapping|Identifier]

    'as' name=Identifier
@@ -447,6 +447,7 @@ PredefinedFunctionCallNot returns tdl::PredefinedFunctionCall: 
;



PredefinedFunctionCallBinary returns tdl::PredefinedFunctionCall:

    //Note: necessary to avoid left recursion

    LParen

    actualParameters+=DataUse 

    function=[tdl::PredefinedFunction|PredefinedIdentifierBinary]
@@ -723,8 +724,8 @@ fragment WithCombinedFragment returns tdl::CombinedBehaviour: 
        NameFragment?

        ObjectiveFragment?

        (comment+=Comment)*

        (periodic+=PeriodicBehaviour)*

        (exceptional+=ExceptionalBehaviour)*

        (periodic+=PeriodicBehaviour //)*

        | exceptional+=ExceptionalBehaviour)*

    END

;
@@ -1731,7 +1732,9 @@ ExpectedBehaviourBehaviour returns tdl::CompoundBehaviour: 
            block=WhenThenBlock

        END

    )

    | block=Block

    //TODO: this does not seem to work

    |

	block=Block

;



FinalConditionsBehaviour returns tdl::CompoundBehaviour: