Commit 084d4073 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ added missing semicolons, support for defining predefined functions 


(will be moved to bundled library)

Change-Id: Idd7fbd9c2e570ebaaba60f91ff0e21427d8d7f6a
Signed-off-by: default avatarmakedonski <makedonski@informatik.uni-goettingen.de>
parent d98eaeed

plugins/org.etsi.mts.tdl.TDLan2/src/org/etsi/mts/tdl/TDLan2.xtext

+13 −3
Original line number Diff line number Diff line
@@ -519,7 +519,8 @@ CollectionDataType returns tdl::CollectionDataType: 
    '{'

        (comment+=Comment (comment+=Comment)*)?

        (annotation+=Annotation (annotation+=Annotation)*)?

    '}')?;

    '}')?

    ';';



CollectionDataInstance returns tdl::CollectionDataInstance:

    {tdl::CollectionDataInstance}
@@ -629,6 +630,16 @@ FunctionCall returns tdl::FunctionCall: 
	'}')?

	;



PredefinedFunction returns tdl::PredefinedFunction:

    'Predefined'

    (name=PredefinedIdentifierBinary

        | name=PredefinedIdentifierNot

        | name=PredefinedIdentifierSize

    )

    ';'

    ;





PredefinedFunctionCall returns tdl::PredefinedFunctionCall:

    PredefinedFunctionCallSize | PredefinedFunctionCallNot | PredefinedFunctionCallBinary

    ;
@@ -850,7 +861,7 @@ OmitValue returns tdl::OmitValue: 


PackageableElement returns tdl::PackageableElement:

//	AnnotationType | TestObjective | DataResourceMapping | DataElementMapping | SimpleDataType_Impl | SimpleDataInstance_Impl | StructuredDataType | StructuredDataInstance | Action_Impl | Function | Verdict | ComponentType | GateType | Time | TimeLabel | TestConfiguration | TestDescription;

	AnnotationType | TestObjective | DataResourceMapping | DataElementMapping | SimpleDataType_Impl | SimpleDataInstance_Impl | StructuredDataType | StructuredDataInstance | Action_Impl | Function | ComponentType | GateType | Time | TestConfiguration | TestDescription | CollectionDataType | CollectionDataInstance | ProcedureSignature;

	AnnotationType | TestObjective | DataResourceMapping | DataElementMapping | SimpleDataType_Impl | SimpleDataInstance_Impl | StructuredDataType | StructuredDataInstance | Action_Impl | Function | ComponentType | GateType | Time | TestConfiguration | TestDescription | CollectionDataType | CollectionDataInstance | ProcedureSignature | PredefinedFunction;



ParallelBehaviour returns tdl::ParallelBehaviour:

	'run' block+=Block ('in' 'parallel' 'to' block+=Block)*
@@ -1303,7 +1314,6 @@ VariableUse returns tdl::VariableUse: 
//    ';'

//	;



PredefinedVerdict returns ecore::EString: 'Verdict';



VerdictAssignment returns tdl::VerdictAssignment:

	'set' 'verdict' 'to'