Skip to content
Snippets Groups Projects
Commit 3f624c84 authored by Reiner Jung's avatar Reiner Jung
Browse files

Added include to declaration.

parent a3ee24a6
No related branches found
No related tags found
No related merge requests found
Pipeline #11488 failed
......@@ -58,7 +58,8 @@
<eLiterals name="mole" value="6" literal="mol"/>
<eLiterals name="candela" value="7" literal="ca"/>
<eLiterals name="pascal" value="8" literal="Pa"/>
<eLiterals name="Joul" value="9" literal="J"/>
<eLiterals name="joule" value="9" literal="J"/>
<eLiterals name="celcius" value="10" literal="C°"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CustomUnit" eSuperTypes="#//PrimitiveUnit #//BasicUnit">
<eOperations name="render" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
......
......@@ -23,10 +23,13 @@ import "http://oceandsl.org/declaration/units" as units
DeclarationModel returns DeclarationModel:
{DeclarationModel}
'model' name=ID
('include' includes+=Include* )?
('types' types+=DeclaredType* )?
(parameterGroupDeclarations+=ParameterGroupDeclaration|featureDeclarations+=FeatureDeclaration)*
;
Include: declaration=[DeclarationModel|ID] | path=STRING;
TypeReference returns types::TypeReference:
TypeReference_Impl | ArrayType;
......@@ -146,6 +149,16 @@ enum EPrefix returns units::EPrefix:
yocto = 'yocto';
enum ESIUnitType returns units::ESIUnitType:
meter = 'meter' | gram = 'gram' | ton = 'ton' | second = 'second' | ampere = 'ampere' | kelvin = 'kelvin' | mole = 'mole' | candela = 'candela' | pascal = 'pascal' | Joul = 'Joul';
meter = 'meter' |
gram = 'gram' |
ton = 'ton' |
second = 'second' |
ampere = 'ampere' |
kelvin = 'kelvin' |
mole = 'mole' |
candela = 'candela' |
pascal = 'pascal' |
celcius = 'celcius' |
joule = 'Joule';
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment