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

* changed DataReference to DataUse, added custom reduced syntax, #194

parent 755ca7a5

plugins/org.etsi.mts.tdl.model/model/structured.ecore

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
  <eClassifiers xsi:type="ecore:EClass" name="EventArgument" eSuperTypes="#//Element"/>

  <eClassifiers xsi:type="ecore:EClass" name="DataReference" eSuperTypes="#//Value #//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="content" lowerBound="1"

        eType="ecore:EClass tdl.ecore#//StaticDataUse" containment="true"/>

        eType="ecore:EClass tdl.ecore#//DataUse" containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="Content" eSuperTypes="#//Element">

    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Value"

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

+27 −1
Original line number Diff line number Diff line
@@ -1731,11 +1731,37 @@ fragment DataReferenceFragment returns to::DataReference: 
    //        especially with data element use and literal value use..

    //        may need further consideration

    //        on the other hand no one really used this for the most part..  

    content=StaticDataUse

    content=TODataElementUse

;



TODataElementUse returns tdl::DataElementUse:

    dataElement=[tdl::NamedElement|Identifier]

    //UnassignedFragmentNamedElement?

	TOParameterBindingFragment? 

	//ReductionFragment?

	//TODO: for some reason the fragment breaks serialisation..

	//(reduction+=MemberReference)*

	//->CollectionItemFragment?

	//CheckFragment?

;



fragment TOParameterBindingFragment returns tdl::DataUse:

    'containing' BEGIN (argument+=TOParameterBinding ( ',' argument+=TOParameterBinding)*)? END

;

    

TOParameterBinding returns tdl::ParameterBinding:

    parameter=[tdl::Parameter|Identifier]

    comment+=AssignmentQualifier

	dataUse=TODataUse

;



TODataUse returns tdl::DataUse:

	TODataElementUse | TOLiteralValueUse

;



TOLiteralValueUse returns tdl::LiteralValueUse:

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

;



//# Event Templates