diff options
author | Kristóf Marussy <kristof@marussy.com> | 2022-09-13 20:39:27 +0200 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2022-09-14 12:10:43 +0200 |
commit | 748bf89911359bffbfafe354e522f7d656488146 (patch) | |
tree | 555fe86e0a068eda1f84538faaca8d6e76fd3bd8 /subprojects/language-model/src/main/resources/model | |
parent | chore(deps): bump dependencies (diff) | |
download | refinery-748bf89911359bffbfafe354e522f7d656488146.tar.gz refinery-748bf89911359bffbfafe354e522f7d656488146.tar.zst refinery-748bf89911359bffbfafe354e522f7d656488146.zip |
refactor(language): clarify containment hierarchy
Diffstat (limited to 'subprojects/language-model/src/main/resources/model')
-rw-r--r-- | subprojects/language-model/src/main/resources/model/problem.ecore | 18 | ||||
-rw-r--r-- | subprojects/language-model/src/main/resources/model/problem.genmodel | 16 |
2 files changed, 29 insertions, 5 deletions
diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore b/subprojects/language-model/src/main/resources/model/problem.ecore index 571d52f3..58f26eae 100644 --- a/subprojects/language-model/src/main/resources/model/problem.ecore +++ b/subprojects/language-model/src/main/resources/model/problem.ecore | |||
@@ -20,15 +20,15 @@ | |||
20 | <eClassifiers xsi:type="ecore:EClass" name="ReferenceDeclaration" eSuperTypes="#//Relation"> | 20 | <eClassifiers xsi:type="ecore:EClass" name="ReferenceDeclaration" eSuperTypes="#//Relation"> |
21 | <eStructuralFeatures xsi:type="ecore:EReference" name="referenceType" eType="#//Relation"/> | 21 | <eStructuralFeatures xsi:type="ecore:EReference" name="referenceType" eType="#//Relation"/> |
22 | <eStructuralFeatures xsi:type="ecore:EReference" name="opposite" eType="#//ReferenceDeclaration"/> | 22 | <eStructuralFeatures xsi:type="ecore:EReference" name="opposite" eType="#//ReferenceDeclaration"/> |
23 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="containment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> | ||
24 | <eStructuralFeatures xsi:type="ecore:EReference" name="multiplicity" eType="#//Multiplicity" | 23 | <eStructuralFeatures xsi:type="ecore:EReference" name="multiplicity" eType="#//Multiplicity" |
25 | containment="true"/> | 24 | containment="true"/> |
25 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//ReferenceKind"/> | ||
26 | </eClassifiers> | 26 | </eClassifiers> |
27 | <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true"> | 27 | <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true"> |
28 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> | 28 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> |
29 | </eClassifiers> | 29 | </eClassifiers> |
30 | <eClassifiers xsi:type="ecore:EClass" name="PredicateDefinition" eSuperTypes="#//Relation #//ParametricDefinition"> | 30 | <eClassifiers xsi:type="ecore:EClass" name="PredicateDefinition" eSuperTypes="#//Relation #//ParametricDefinition"> |
31 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="error" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> | 31 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//PredicateKind"/> |
32 | </eClassifiers> | 32 | </eClassifiers> |
33 | <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="#//Variable"> | 33 | <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="#//Variable"> |
34 | <eStructuralFeatures xsi:type="ecore:EReference" name="parameterType" eType="#//Relation"/> | 34 | <eStructuralFeatures xsi:type="ecore:EReference" name="parameterType" eType="#//Relation"/> |
@@ -78,7 +78,7 @@ | |||
78 | </eClassifiers> | 78 | </eClassifiers> |
79 | <eClassifiers xsi:type="ecore:EClass" name="Statement" abstract="true" interface="true"/> | 79 | <eClassifiers xsi:type="ecore:EClass" name="Statement" abstract="true" interface="true"/> |
80 | <eClassifiers xsi:type="ecore:EClass" name="TypeScope"> | 80 | <eClassifiers xsi:type="ecore:EClass" name="TypeScope"> |
81 | <eStructuralFeatures xsi:type="ecore:EReference" name="targetType" eType="#//ClassDeclaration"/> | 81 | <eStructuralFeatures xsi:type="ecore:EReference" name="targetType" eType="#//Relation"/> |
82 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="increment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> | 82 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="increment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> |
83 | <eStructuralFeatures xsi:type="ecore:EReference" name="multiplicity" eType="#//Multiplicity" | 83 | <eStructuralFeatures xsi:type="ecore:EReference" name="multiplicity" eType="#//Multiplicity" |
84 | containment="true"/> | 84 | containment="true"/> |
@@ -191,4 +191,16 @@ | |||
191 | <eLiterals name="GREATER_EQ" value="3"/> | 191 | <eLiterals name="GREATER_EQ" value="3"/> |
192 | <eLiterals name="EQ" value="4"/> | 192 | <eLiterals name="EQ" value="4"/> |
193 | </eClassifiers> | 193 | </eClassifiers> |
194 | <eClassifiers xsi:type="ecore:EEnum" name="ReferenceKind"> | ||
195 | <eLiterals name="DEFAULT"/> | ||
196 | <eLiterals name="REFERENCE" value="1"/> | ||
197 | <eLiterals name="CONTAINMENT" value="2"/> | ||
198 | <eLiterals name="CONTAINER" value="3"/> | ||
199 | </eClassifiers> | ||
200 | <eClassifiers xsi:type="ecore:EEnum" name="PredicateKind"> | ||
201 | <eLiterals name="DEFAULT"/> | ||
202 | <eLiterals name="ERROR" value="1"/> | ||
203 | <eLiterals name="CONTAINED" value="2"/> | ||
204 | <eLiterals name="CONTAINMENT" value="3"/> | ||
205 | </eClassifiers> | ||
194 | </ecore:EPackage> | 206 | </ecore:EPackage> |
diff --git a/subprojects/language-model/src/main/resources/model/problem.genmodel b/subprojects/language-model/src/main/resources/model/problem.genmodel index 1b72ecfd..5442d29d 100644 --- a/subprojects/language-model/src/main/resources/model/problem.genmodel +++ b/subprojects/language-model/src/main/resources/model/problem.genmodel | |||
@@ -29,6 +29,18 @@ | |||
29 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/GREATER_EQ"/> | 29 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/GREATER_EQ"/> |
30 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/EQ"/> | 30 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/EQ"/> |
31 | </genEnums> | 31 | </genEnums> |
32 | <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//ReferenceKind"> | ||
33 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ReferenceKind/DEFAULT"/> | ||
34 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ReferenceKind/REFERENCE"/> | ||
35 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ReferenceKind/CONTAINMENT"/> | ||
36 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ReferenceKind/CONTAINER"/> | ||
37 | </genEnums> | ||
38 | <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//PredicateKind"> | ||
39 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/DEFAULT"/> | ||
40 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/ERROR"/> | ||
41 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/CONTAINED"/> | ||
42 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/CONTAINMENT"/> | ||
43 | </genEnums> | ||
32 | <genClasses ecoreClass="problem.ecore#//Problem"> | 44 | <genClasses ecoreClass="problem.ecore#//Problem"> |
33 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/nodes"/> | 45 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/nodes"/> |
34 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/statements"/> | 46 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/statements"/> |
@@ -43,14 +55,14 @@ | |||
43 | <genClasses ecoreClass="problem.ecore#//ReferenceDeclaration"> | 55 | <genClasses ecoreClass="problem.ecore#//ReferenceDeclaration"> |
44 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/referenceType"/> | 56 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/referenceType"/> |
45 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/opposite"/> | 57 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/opposite"/> |
46 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ReferenceDeclaration/containment"/> | ||
47 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/multiplicity"/> | 58 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/multiplicity"/> |
59 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ReferenceDeclaration/kind"/> | ||
48 | </genClasses> | 60 | </genClasses> |
49 | <genClasses ecoreClass="problem.ecore#//NamedElement"> | 61 | <genClasses ecoreClass="problem.ecore#//NamedElement"> |
50 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//NamedElement/name"/> | 62 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//NamedElement/name"/> |
51 | </genClasses> | 63 | </genClasses> |
52 | <genClasses ecoreClass="problem.ecore#//PredicateDefinition"> | 64 | <genClasses ecoreClass="problem.ecore#//PredicateDefinition"> |
53 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//PredicateDefinition/error"/> | 65 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//PredicateDefinition/kind"/> |
54 | </genClasses> | 66 | </genClasses> |
55 | <genClasses ecoreClass="problem.ecore#//Parameter"> | 67 | <genClasses ecoreClass="problem.ecore#//Parameter"> |
56 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Parameter/parameterType"/> | 68 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Parameter/parameterType"/> |