diff options
author | Kristóf Marussy <kristof@marussy.com> | 2022-11-20 20:52:17 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2022-11-22 16:40:03 +0100 |
commit | 19d38b03de9af68e6234a2a07ac54c36d73edaa7 (patch) | |
tree | f6c402aa3610bdf66fb842e3b6206622eed8a2fd /subprojects/language-model/src | |
parent | refactor(test): WebSocket integ test robustness (diff) | |
download | refinery-19d38b03de9af68e6234a2a07ac54c36d73edaa7.tar.gz refinery-19d38b03de9af68e6234a2a07ac54c36d73edaa7.tar.zst refinery-19d38b03de9af68e6234a2a07ac54c36d73edaa7.zip |
refactor(language): simplify syntax
Diffstat (limited to 'subprojects/language-model/src')
-rw-r--r-- | subprojects/language-model/src/main/resources/model/problem.ecore | 13 | ||||
-rw-r--r-- | subprojects/language-model/src/main/resources/model/problem.genmodel | 13 |
2 files changed, 12 insertions, 14 deletions
diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore b/subprojects/language-model/src/main/resources/model/problem.ecore index 314639c1..2d86382d 100644 --- a/subprojects/language-model/src/main/resources/model/problem.ecore +++ b/subprojects/language-model/src/main/resources/model/problem.ecore | |||
@@ -54,7 +54,7 @@ | |||
54 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="default" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" | 54 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="default" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" |
55 | defaultValueLiteral="false"/> | 55 | defaultValueLiteral="false"/> |
56 | <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/> | 56 | <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/> |
57 | <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//AssertionValue" | 57 | <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Expr" |
58 | containment="true"/> | 58 | containment="true"/> |
59 | </eClassifiers> | 59 | </eClassifiers> |
60 | <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//VariableOrNode"/> | 60 | <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//VariableOrNode"/> |
@@ -159,6 +159,10 @@ | |||
159 | <eLiterals name="EQ" value="4"/> | 159 | <eLiterals name="EQ" value="4"/> |
160 | <eLiterals name="NOT_EQ" value="5"/> | 160 | <eLiterals name="NOT_EQ" value="5"/> |
161 | <eLiterals name="IN" value="6"/> | 161 | <eLiterals name="IN" value="6"/> |
162 | <eLiterals name="SUBSUMES" value="7"/> | ||
163 | <eLiterals name="SUBSUMED_BY" value="8"/> | ||
164 | <eLiterals name="ABS_EQ" value="9"/> | ||
165 | <eLiterals name="ABS_NOT_EQ" value="10"/> | ||
162 | </eClassifiers> | 166 | </eClassifiers> |
163 | <eClassifiers xsi:type="ecore:EEnum" name="ReferenceKind"> | 167 | <eClassifiers xsi:type="ecore:EEnum" name="ReferenceKind"> |
164 | <eLiterals name="REFERENCE" value="1"/> | 168 | <eLiterals name="REFERENCE" value="1"/> |
@@ -257,12 +261,7 @@ | |||
257 | <eLiterals name="REAL" value="1"/> | 261 | <eLiterals name="REAL" value="1"/> |
258 | <eLiterals name="STRING" value="2"/> | 262 | <eLiterals name="STRING" value="2"/> |
259 | </eClassifiers> | 263 | </eClassifiers> |
260 | <eClassifiers xsi:type="ecore:EClass" name="AssertionValue" abstract="true"/> | 264 | <eClassifiers xsi:type="ecore:EClass" name="LogicConstant" eSuperTypes="#//Constant"> |
261 | <eClassifiers xsi:type="ecore:EClass" name="LogicAssertionValue" eSuperTypes="#//AssertionValue"> | ||
262 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="logicValue" eType="#//LogicValue"/> | 265 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="logicValue" eType="#//LogicValue"/> |
263 | </eClassifiers> | 266 | </eClassifiers> |
264 | <eClassifiers xsi:type="ecore:EClass" name="ExprAssertionValue" eSuperTypes="#//AssertionValue"> | ||
265 | <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="#//Expr" containment="true"/> | ||
266 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="range" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> | ||
267 | </eClassifiers> | ||
268 | </ecore:EPackage> | 267 | </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 c5d7c0ea..5767d18d 100644 --- a/subprojects/language-model/src/main/resources/model/problem.genmodel +++ b/subprojects/language-model/src/main/resources/model/problem.genmodel | |||
@@ -30,6 +30,10 @@ | |||
30 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/EQ"/> | 30 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/EQ"/> |
31 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/NOT_EQ"/> | 31 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/NOT_EQ"/> |
32 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/IN"/> | 32 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/IN"/> |
33 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/SUBSUMES"/> | ||
34 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/SUBSUMED_BY"/> | ||
35 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/ABS_EQ"/> | ||
36 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/ABS_NOT_EQ"/> | ||
33 | </genEnums> | 37 | </genEnums> |
34 | <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//ReferenceKind"> | 38 | <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//ReferenceKind"> |
35 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ReferenceKind/REFERENCE"/> | 39 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ReferenceKind/REFERENCE"/> |
@@ -226,13 +230,8 @@ | |||
226 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//AttributeDeclaration/attributeType"/> | 230 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//AttributeDeclaration/attributeType"/> |
227 | </genClasses> | 231 | </genClasses> |
228 | <genClasses ecoreClass="problem.ecore#//FlagDeclaration"/> | 232 | <genClasses ecoreClass="problem.ecore#//FlagDeclaration"/> |
229 | <genClasses ecoreClass="problem.ecore#//AssertionValue"/> | 233 | <genClasses ecoreClass="problem.ecore#//LogicConstant"> |
230 | <genClasses ecoreClass="problem.ecore#//LogicAssertionValue"> | 234 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//LogicConstant/logicValue"/> |
231 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//LogicAssertionValue/logicValue"/> | ||
232 | </genClasses> | ||
233 | <genClasses ecoreClass="problem.ecore#//ExprAssertionValue"> | ||
234 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ExprAssertionValue/body"/> | ||
235 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ExprAssertionValue/range"/> | ||
236 | </genClasses> | 235 | </genClasses> |
237 | </genPackages> | 236 | </genPackages> |
238 | </genmodel:GenModel> | 237 | </genmodel:GenModel> |