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

+ minor updates to legacy syntax

parent 1b6e745c

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

+37 −38
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ Action returns tdl::Action: 
ActionReference returns tdl::ActionReference:

	'perform' 'action'

	action=[tdl::Action|Identifier]

	('(' actualParameter+=ParameterBinding ( "," actualParameter+=ParameterBinding)* ')' )?

	('(' argument+=ParameterBinding ( "," argument+=ParameterBinding)* ')' )?

	('on' componentInstance=[tdl::ComponentInstance|Identifier])?

	(

	'with'
@@ -97,14 +97,13 @@ AnnotationType returns tdl::AnnotationType: 


AnyValueOrOmit returns tdl::AnyValueOrOmit:

	{tdl::AnyValueOrOmit}

	'*'

	name='*'

	//('(' argument+=ParameterBinding ( "," argument+=ParameterBinding)* ')' )?

	(

	'with'

	  '{'

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

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

		('name' name=Identifier)?

	'}')?

	;
@@ -154,8 +153,8 @@ Assertion returns tdl::Assertion: 
	';';



Assignment returns tdl::Assignment:

	//TODO: shall be mandatory

	(componentInstance=[tdl::ComponentInstance|Identifier] '->')?

	//DONE: shall be mandatory -> updated MM superclass

	//(componentInstance=[tdl::ComponentInstance|Identifier] '->')?

	variable=VariableUse

	'=' 

	expression=DataUse
@@ -541,6 +540,7 @@ CollectionDataInstance returns tdl::CollectionDataInstance: 


    dataType=[tdl::DataType|Identifier]

    name=Identifier

    (unassignedMember=UnassignedMemberTreatment)?

    'containing' '{' 

        (item+=StaticDataUse ("," item+=StaticDataUse)*)?

    '}'
@@ -580,7 +580,7 @@ QIdentifier returns ecore::EString: 


PredefinedIdentifierBinary returns ecore::EString:

    '+' | '-' | '*' | '/' | 'mod' 

  | '>' | '<' | '>=' | '<=' | '>='

  | '>' | '<' | '>=' | '<='

  | '==' | '!=' | 'and' | 'or' | 'xor'

;
@@ -874,14 +874,13 @@ ParameterMapping returns tdl::ParameterMapping: 


OmitValue returns tdl::OmitValue:

	{tdl::OmitValue}

	'omit'

	name='omit'

    (

    'with'

    '{'

		('argument' '{' argument+=ParameterBinding ( "," argument+=ParameterBinding)* '}' )?

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

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

		('name' name=Identifier)?

	'}')?;
@@ -1078,7 +1077,7 @@ StructuredDataType returns tdl::StructuredDataType: 
	'Type'

	name=Identifier

    ('{' constraint+=Constraint '}')* 

	(extension=Extension)?

	(extension+=Extension (',' extension+=Extension)*)?

	'(' ( member+=Member ( "," member+=Member)* )? ')'

   	(

    'with'
@@ -1092,52 +1091,52 @@ TargetMessage returns tdl::Target: 
	targetGate=[tdl::GateReference|IdentifierDot]

	//TODO: check what the correct syntax shall be

	(valueAssignment+=ValueAssignmentMessage)?

   	(

    'with'

    '{'

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

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

		('name' name=Identifier)?

    '}')?

//   	(

//    'with'

//    '{'

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

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

//		('name' name=Identifier)?

//    '}')?

    ;



TargetProcedure returns tdl::Target:

    targetGate=[tdl::GateReference|IdentifierDot]

    //TODO: check what the correct syntax shall be

    (valueAssignment+=ValueAssignmentProcedure ("," valueAssignment+=ValueAssignmentProcedure)*)?

    (

    'with'

    '{'

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

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

        ('name' name=Identifier)?

    '}')?

//    (

//    'with'

//    '{'

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

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

//        ('name' name=Identifier)?

//    '}')?

    ;





ValueAssignmentMessage returns tdl::ValueAssignment:

    //TODO: check what the correct syntax shall be

    'where' 'it' 'is' 'assigned' 'to' variable=[tdl::Variable|Identifier]

    (

    'with'

    '{'

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

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

        ('name' name=Identifier)?

    '}')?

//    (

//    'with'

//    '{'

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

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

//        ('name' name=Identifier)?

//    '}')?

    ;



ValueAssignmentProcedure returns tdl::ValueAssignment:

    //TODO: check what the correct syntax shall be

    'where' parameter=[tdl::Parameter|Identifier] 'is' 'assigned' 'to' variable=[tdl::Variable|Identifier]

    

    (

    'with'

    '{'

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

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

        ('name' name=Identifier)?

    '}')?

//    (

//    'with'

//    '{'

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

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

//        ('name' name=Identifier)?

//    '}')?

    ;
@@ -1174,7 +1173,7 @@ TestDescription returns tdl::TestDescription: 
TestDescriptionReference returns tdl::TestDescriptionReference:

	'execute'

	testDescription=[tdl::TestDescription|Identifier]

	('(' actualParameter+=ParameterBinding ( "," actualParameter+=ParameterBinding)* ')' )?

	('(' argument+=ParameterBinding ( "," argument+=ParameterBinding)* ')' )?

	('with'

	  '{'

		('bindings' '{' componentInstanceBinding+=ComponentInstanceBinding ( "," componentInstanceBinding+=ComponentInstanceBinding)* '}' )?