diff options
author | 2023-08-15 12:35:06 +0200 | |
---|---|---|
committer | 2023-08-15 16:56:29 +0200 | |
commit | c4757c72887d0d83a51099c9f33d3e027f55a4e6 (patch) | |
tree | 0cf4a86036be9cca1fd940492001e973d174e4c7 /subprojects/language-model/src/main/resources | |
parent | fix: concrete supertype translation (diff) | |
download | refinery-c4757c72887d0d83a51099c9f33d3e027f55a4e6.tar.gz refinery-c4757c72887d0d83a51099c9f33d3e027f55a4e6.tar.zst refinery-c4757c72887d0d83a51099c9f33d3e027f55a4e6.zip |
refactor(language): invalid multiplicity trace
Also simplifies attributes and flags for now, as we don't translate them to
abstractions.
Diffstat (limited to 'subprojects/language-model/src/main/resources')
-rw-r--r-- | subprojects/language-model/src/main/resources/model/problem.ecore | 11 | ||||
-rw-r--r-- | subprojects/language-model/src/main/resources/model/problem.genmodel | 10 |
2 files changed, 5 insertions, 16 deletions
diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore b/subprojects/language-model/src/main/resources/model/problem.ecore index 2d86382d..204f922c 100644 --- a/subprojects/language-model/src/main/resources/model/problem.ecore +++ b/subprojects/language-model/src/main/resources/model/problem.ecore | |||
@@ -22,17 +22,18 @@ | |||
22 | containment="true"/> | 22 | containment="true"/> |
23 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//ReferenceKind"/> | 23 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//ReferenceKind"/> |
24 | <eStructuralFeatures xsi:type="ecore:EReference" name="referenceType" eType="#//Relation"/> | 24 | <eStructuralFeatures xsi:type="ecore:EReference" name="referenceType" eType="#//Relation"/> |
25 | <eStructuralFeatures xsi:type="ecore:EReference" name="invalidMultiplicity" eType="#//Relation" | ||
26 | containment="true"/> | ||
25 | </eClassifiers> | 27 | </eClassifiers> |
26 | <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true"> | 28 | <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true"> |
27 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> | 29 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> |
28 | </eClassifiers> | 30 | </eClassifiers> |
29 | <eClassifiers xsi:type="ecore:EClass" name="PredicateDefinition" eSuperTypes="#//ParametricDefinition #//Relation"> | 31 | <eClassifiers xsi:type="ecore:EClass" name="PredicateDefinition" eSuperTypes="#//ParametricDefinition #//Relation"> |
30 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//PredicateKind"/> | ||
31 | <eStructuralFeatures xsi:type="ecore:EReference" name="bodies" upperBound="-1" | 32 | <eStructuralFeatures xsi:type="ecore:EReference" name="bodies" upperBound="-1" |
32 | eType="#//Conjunction" containment="true"/> | 33 | eType="#//Conjunction" containment="true"/> |
34 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="error" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> | ||
33 | </eClassifiers> | 35 | </eClassifiers> |
34 | <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="#//Variable"> | 36 | <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="#//Variable"> |
35 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="modality" eType="#//Modality"/> | ||
36 | <eStructuralFeatures xsi:type="ecore:EReference" name="parameterType" eType="#//Relation"/> | 37 | <eStructuralFeatures xsi:type="ecore:EReference" name="parameterType" eType="#//Relation"/> |
37 | </eClassifiers> | 38 | </eClassifiers> |
38 | <eClassifiers xsi:type="ecore:EClass" name="Variable" abstract="true" eSuperTypes="#//VariableOrNode"/> | 39 | <eClassifiers xsi:type="ecore:EClass" name="Variable" abstract="true" eSuperTypes="#//VariableOrNode"/> |
@@ -169,12 +170,6 @@ | |||
169 | <eLiterals name="CONTAINMENT" value="2"/> | 170 | <eLiterals name="CONTAINMENT" value="2"/> |
170 | <eLiterals name="CONTAINER" value="3"/> | 171 | <eLiterals name="CONTAINER" value="3"/> |
171 | </eClassifiers> | 172 | </eClassifiers> |
172 | <eClassifiers xsi:type="ecore:EEnum" name="PredicateKind"> | ||
173 | <eLiterals name="DEFAULT"/> | ||
174 | <eLiterals name="ERROR" value="1"/> | ||
175 | <eLiterals name="CONTAINED" value="2"/> | ||
176 | <eLiterals name="CONTAINMENT" value="3"/> | ||
177 | </eClassifiers> | ||
178 | <eClassifiers xsi:type="ecore:EClass" name="Expr" abstract="true"/> | 173 | <eClassifiers xsi:type="ecore:EClass" name="Expr" abstract="true"/> |
179 | <eClassifiers xsi:type="ecore:EClass" name="VariableOrNodeExpr" eSuperTypes="#//Expr"> | 174 | <eClassifiers xsi:type="ecore:EClass" name="VariableOrNodeExpr" eSuperTypes="#//Expr"> |
180 | <eStructuralFeatures xsi:type="ecore:EReference" name="variableOrNode" eType="#//VariableOrNode"/> | 175 | <eStructuralFeatures xsi:type="ecore:EReference" name="variableOrNode" eType="#//VariableOrNode"/> |
diff --git a/subprojects/language-model/src/main/resources/model/problem.genmodel b/subprojects/language-model/src/main/resources/model/problem.genmodel index 5767d18d..b5aa81c4 100644 --- a/subprojects/language-model/src/main/resources/model/problem.genmodel +++ b/subprojects/language-model/src/main/resources/model/problem.genmodel | |||
@@ -40,12 +40,6 @@ | |||
40 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ReferenceKind/CONTAINMENT"/> | 40 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ReferenceKind/CONTAINMENT"/> |
41 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ReferenceKind/CONTAINER"/> | 41 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ReferenceKind/CONTAINER"/> |
42 | </genEnums> | 42 | </genEnums> |
43 | <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//PredicateKind"> | ||
44 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/DEFAULT"/> | ||
45 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/ERROR"/> | ||
46 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/CONTAINED"/> | ||
47 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/CONTAINMENT"/> | ||
48 | </genEnums> | ||
49 | <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//UnaryOp"> | 43 | <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//UnaryOp"> |
50 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//UnaryOp/PLUS"/> | 44 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//UnaryOp/PLUS"/> |
51 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//UnaryOp/MINUS"/> | 45 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//UnaryOp/MINUS"/> |
@@ -85,16 +79,16 @@ | |||
85 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/multiplicity"/> | 79 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/multiplicity"/> |
86 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ReferenceDeclaration/kind"/> | 80 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ReferenceDeclaration/kind"/> |
87 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/referenceType"/> | 81 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/referenceType"/> |
82 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/invalidMultiplicity"/> | ||
88 | </genClasses> | 83 | </genClasses> |
89 | <genClasses ecoreClass="problem.ecore#//NamedElement"> | 84 | <genClasses ecoreClass="problem.ecore#//NamedElement"> |
90 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//NamedElement/name"/> | 85 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//NamedElement/name"/> |
91 | </genClasses> | 86 | </genClasses> |
92 | <genClasses ecoreClass="problem.ecore#//PredicateDefinition"> | 87 | <genClasses ecoreClass="problem.ecore#//PredicateDefinition"> |
93 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//PredicateDefinition/kind"/> | ||
94 | <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//PredicateDefinition/bodies"/> | 88 | <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//PredicateDefinition/bodies"/> |
89 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//PredicateDefinition/error"/> | ||
95 | </genClasses> | 90 | </genClasses> |
96 | <genClasses ecoreClass="problem.ecore#//Parameter"> | 91 | <genClasses ecoreClass="problem.ecore#//Parameter"> |
97 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Parameter/modality"/> | ||
98 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Parameter/parameterType"/> | 92 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Parameter/parameterType"/> |
99 | </genClasses> | 93 | </genClasses> |
100 | <genClasses ecoreClass="problem.ecore#//Variable"/> | 94 | <genClasses ecoreClass="problem.ecore#//Variable"/> |