Commit 2b6beb51 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ initial support for default values for parameters and simple data instances, #213, #214

parent d26b8916

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

+8 −2
Original line number Diff line number Diff line
@@ -147,7 +147,10 @@ 
    <eStructuralFeatures xsi:type="ecore:EReference" name="extension" eType="#//Extension"

        containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="SimpleDataInstance" eSuperTypes="#//DataInstance"/>

  <eClassifiers xsi:type="ecore:EClass" name="SimpleDataInstance" eSuperTypes="#//DataInstance">

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

        containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="StructuredDataType" eSuperTypes="#//DataType">

    <eOperations name="allMembers" upperBound="-1" eType="#//Member">

      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
@@ -240,7 +243,10 @@ 
    <eStructuralFeatures xsi:type="ecore:EReference" name="formalParameter" upperBound="-1"

        eType="#//FormalParameter" containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="FormalParameter" eSuperTypes="#//Parameter"/>

  <eClassifiers xsi:type="ecore:EClass" name="FormalParameter" eSuperTypes="#//Parameter">

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

        containment="true"/>

  </eClassifiers>

  <eClassifiers xsi:type="ecore:EClass" name="Function" eSuperTypes="#//Action">

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

        eType="#//DataType"/>

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

+2 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ SimpleDataInstance returns tdl::SimpleDataInstance: 
    //for backwards compatibility -> Predefined Booleans now True and False

    //(name=Identifier | name=BOOLEANNAME)

    name=Identifier 

    ('=' value=DataUse)?

;



EnumDataInstance returns tdl::SimpleDataInstance:
@@ -297,6 +298,7 @@ FormalParameter returns tdl::FormalParameter: 
    AnnotationFragment?

    dataType=[tdl::DataType|Identifier]

    name=ParameterIdentifier

    ('=' value=DataUse)?    

    WithCommentFragment?

;