From 19d38b03de9af68e6234a2a07ac54c36d73edaa7 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Sun, 20 Nov 2022 20:52:17 +0100
Subject: refactor(language): simplify syntax

---
 .../language-model/src/main/resources/model/problem.ecore   | 13 ++++++-------
 .../src/main/resources/model/problem.genmodel               | 13 ++++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'subprojects/language-model/src')

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 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="default" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//AssertionValue"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Expr"
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//VariableOrNode"/>
@@ -159,6 +159,10 @@
     <eLiterals name="EQ" value="4"/>
     <eLiterals name="NOT_EQ" value="5"/>
     <eLiterals name="IN" value="6"/>
+    <eLiterals name="SUBSUMES" value="7"/>
+    <eLiterals name="SUBSUMED_BY" value="8"/>
+    <eLiterals name="ABS_EQ" value="9"/>
+    <eLiterals name="ABS_NOT_EQ" value="10"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="ReferenceKind">
     <eLiterals name="REFERENCE" value="1"/>
@@ -257,12 +261,7 @@
     <eLiterals name="REAL" value="1"/>
     <eLiterals name="STRING" value="2"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AssertionValue" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="LogicAssertionValue" eSuperTypes="#//AssertionValue">
+  <eClassifiers xsi:type="ecore:EClass" name="LogicConstant" eSuperTypes="#//Constant">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="logicValue" eType="#//LogicValue"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExprAssertionValue" eSuperTypes="#//AssertionValue">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="body" eType="#//Expr" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="range" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
 </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 @@
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/EQ"/>
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/NOT_EQ"/>
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/IN"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/SUBSUMES"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/SUBSUMED_BY"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/ABS_EQ"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ComparisonOp/ABS_NOT_EQ"/>
     </genEnums>
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//ReferenceKind">
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ReferenceKind/REFERENCE"/>
@@ -226,13 +230,8 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//AttributeDeclaration/attributeType"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//FlagDeclaration"/>
-    <genClasses ecoreClass="problem.ecore#//AssertionValue"/>
-    <genClasses ecoreClass="problem.ecore#//LogicAssertionValue">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//LogicAssertionValue/logicValue"/>
-    </genClasses>
-    <genClasses ecoreClass="problem.ecore#//ExprAssertionValue">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ExprAssertionValue/body"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ExprAssertionValue/range"/>
+    <genClasses ecoreClass="problem.ecore#//LogicConstant">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//LogicConstant/logicValue"/>
     </genClasses>
   </genPackages>
 </genmodel:GenModel>
-- 
cgit v1.2.3-70-g09d2