Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cp-dsl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
oceandsl
cp-dsl
Commits
3f624c84
Commit
3f624c84
authored
2 years ago
by
Reiner Jung
Browse files
Options
Downloads
Patches
Plain Diff
Added include to declaration.
parent
a3ee24a6
Branches
master
No related tags found
No related merge requests found
Pipeline
#11488
failed
2 years ago
Stage: clean
Stage: build
Stage: package
Stage: check
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bundles/org.oceandsl.declaration/model/Units.ecore
+2
-1
2 additions, 1 deletion
bundles/org.oceandsl.declaration/model/Units.ecore
bundles/org.oceandsl.declaration/src/org/oceandsl/declaration/Declaration.xtext
+14
-1
14 additions, 1 deletion
...eclaration/src/org/oceandsl/declaration/Declaration.xtext
with
16 additions
and
2 deletions
bundles/org.oceandsl.declaration/model/Units.ecore
+
2
−
1
View file @
3f624c84
...
@@ -58,7 +58,8 @@
...
@@ -58,7 +58,8 @@
<eLiterals
name=
"mole"
value=
"6"
literal=
"mol"
/>
<eLiterals
name=
"mole"
value=
"6"
literal=
"mol"
/>
<eLiterals
name=
"candela"
value=
"7"
literal=
"ca"
/>
<eLiterals
name=
"candela"
value=
"7"
literal=
"ca"
/>
<eLiterals
name=
"pascal"
value=
"8"
literal=
"Pa"
/>
<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>
<eClassifiers
xsi:type=
"ecore:EClass"
name=
"CustomUnit"
eSuperTypes=
"#//PrimitiveUnit #//BasicUnit"
>
<eClassifiers
xsi:type=
"ecore:EClass"
name=
"CustomUnit"
eSuperTypes=
"#//PrimitiveUnit #//BasicUnit"
>
<eOperations
name=
"render"
eType=
"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
>
<eOperations
name=
"render"
eType=
"ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
>
...
...
This diff is collapsed.
Click to expand it.
bundles/org.oceandsl.declaration/src/org/oceandsl/declaration/Declaration.xtext
+
14
−
1
View file @
3f624c84
...
@@ -23,10 +23,13 @@ import "http://oceandsl.org/declaration/units" as units
...
@@ -23,10 +23,13 @@ import "http://oceandsl.org/declaration/units" as units
DeclarationModel returns DeclarationModel:
DeclarationModel returns DeclarationModel:
{DeclarationModel}
{DeclarationModel}
'model' name=ID
'model' name=ID
('include' includes+=Include* )?
('types' types+=DeclaredType* )?
('types' types+=DeclaredType* )?
(parameterGroupDeclarations+=ParameterGroupDeclaration|featureDeclarations+=FeatureDeclaration)*
(parameterGroupDeclarations+=ParameterGroupDeclaration|featureDeclarations+=FeatureDeclaration)*
;
;
Include: declaration=[DeclarationModel|ID] | path=STRING;
TypeReference returns types::TypeReference:
TypeReference returns types::TypeReference:
TypeReference_Impl | ArrayType;
TypeReference_Impl | ArrayType;
...
@@ -146,6 +149,16 @@ enum EPrefix returns units::EPrefix:
...
@@ -146,6 +149,16 @@ enum EPrefix returns units::EPrefix:
yocto = 'yocto';
yocto = 'yocto';
enum ESIUnitType returns units::ESIUnitType:
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';
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment