Commit 5c6b9856 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ added specialised PIXIT annotation for data instances, #190

parent e2263eac
Loading
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -76,6 +76,11 @@ fragment AnnotationCommentFragment returns tdl::Element:
    //(annotation+=Annotation)*
;

fragment PIXITAnnotationFragment returns tdl::Element:
	annotation+=PIXITAnnotation
;


fragment NameFragment returns tdl::Element:
    'Name' ':' name=Identifier
;
@@ -128,6 +133,11 @@ CheckAnnotation returns tdl::Annotation:
    (':' value=EString)
;

PIXITAnnotation returns tdl::Annotation:
    key=[tdl::AnnotationType|PIXITName]
    (':' value=EString)?
;


AnnotationType returns tdl::AnnotationType:
    AnnotationCommentFragment
@@ -203,6 +213,7 @@ SimpleDataType returns tdl::SimpleDataType:
//DONE: boolean data instance
SimpleDataInstance returns tdl::SimpleDataInstance:
    AnnotationCommentFragment
    PIXITAnnotationFragment?
    dataType=[tdl::DataType|Identifier]
    //for backwards compatibility -> Predefined Booleans now True and False
    //(name=Identifier | name=BOOLEANNAME)
@@ -236,6 +247,7 @@ Member returns tdl::Member:

StructuredDataInstance returns tdl::StructuredDataInstance:
    AnnotationCommentFragment
    PIXITAnnotationFragment?
    dataType=[tdl::DataType|Identifier]
    name=Identifier
    ('<' unassignedMember=UnassignedMemberTreatment '>')?
@@ -250,6 +262,7 @@ MemberAssignment returns tdl::MemberAssignment:

CollectionDataType returns tdl::CollectionDataType:
    AnnotationCommentFragment
    PIXITAnnotationFragment?
    'Collection' name=Identifier
    ConstraintFragment
    'of' itemType=[tdl::DataType|Identifier]