Commit aab858d9 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* refinements, still conflict between literal value use numer and number as identifier..

parent c4ecb7e1

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

+5 −5
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ DataInstanceUse returns tdl::DataInstanceUse: 
	(

		//referenced DataInstance, arguments or reduction optional

		(	

			(	

			(	//TODO: conflicts with LiteralValueUse, important for backwards compatibility

				(	dataInstance=[tdl::DataInstance|NumberAsIdentifier] | 

					dataInstance=[tdl::DataInstance|Identifier]

				)
@@ -638,7 +638,7 @@ PackageableElement returns tdl::PackageableElement: 
	| EnumDataType

	)

	CommentAnnotationFragment

	';' //TODO: make all semicolons optional?

	';'?

	;



ParallelBehaviour returns tdl::ParallelBehaviour:
@@ -704,7 +704,7 @@ SimpleDataInstance_Impl returns tdl::SimpleDataInstance: 
SimpleDataType_Impl returns tdl::SimpleDataType:

	{tdl::SimpleDataType}

	//'Simple' 'Data' 'Type'

    ConstraintFragment?

    ConstraintFragment

	'Type'

	name=Identifier

	;
@@ -738,7 +738,7 @@ StructuredDataType returns tdl::StructuredDataType: 
	{tdl::StructuredDataType}

	//TODO: this seems broken

	//'Structured' 'Data' 'Type'

    ConstraintFragment?

    ConstraintFragment

	'Type'

	name=Identifier

	(extension=Extension)?
@@ -926,7 +926,7 @@ Extension returns tdl::Extension: 


LiteralValueUse returns tdl::LiteralValueUse:

	{tdl::LiteralValueUse}

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

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

	(

 		'of' 'type' dataType=[tdl::DataType|Identifier]

	)?