refactor: direct predicates

* Remove the direct keyword because it can be inferred
* Use may/must/current instead of value literals
* Transformation rule changes

2 files changed, 46 insertions, 65 deletions

diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore b/subprojects/language-model/src/main/resources/model/problem.ecore
index 582f67c8..16683952 100644
--- a/subprojects/language-model/src/main/resources/model/problem.ecore
+++ b/subprojects/language-model/src/main/resources/model/problem.ecore
@@ -29,8 +29,6 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PredicateDefinition" eSuperTypes="#//Relation #//ParametricDefinition">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="error" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//PredicateKind"
-        defaultValueLiteral="PARTIAL"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="#//Variable">
     <eStructuralFeatures xsi:type="ecore:EReference" name="parameterType" eType="#//Relation"/>
@@ -40,7 +38,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="literals" upperBound="-1"
         eType="#//Literal" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Literal" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Literal" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="modality" eType="#//Modality"/>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Atom" eSuperTypes="#//Literal">
     <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="transitiveClosure" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
@@ -48,7 +48,9 @@
         eType="#//Argument" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ImplicitVariable" eSuperTypes="#//Variable"/>
-  <eClassifiers xsi:type="ecore:EClass" name="NegativeLiteral" eSuperTypes="#//ExistentialQuantifier #//CompoundLiteral"/>
+  <eClassifiers xsi:type="ecore:EClass" name="NegativeLiteral" eSuperTypes="#//ExistentialQuantifier #//Literal">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="atom" eType="#//Atom" containment="true"/>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ExistentialQuantifier" abstract="true"
       interface="true">
     <eStructuralFeatures xsi:type="ecore:EReference" name="implicitVariables" upperBound="-1"
@@ -145,47 +147,34 @@
         eType="#//Parameter" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="RuleDefinition" eSuperTypes="#//ParametricDefinition #//NamedElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//RuleKind"
-        defaultValueLiteral="DIRECT"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="action" eType="#//Action"
-        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="consequents" upperBound="-1"
+        eType="#//Consequent" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Action">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="actionLiterals" upperBound="-1"
-        eType="#//ActionLiteral" containment="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Consequent">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="actions" upperBound="-1"
+        eType="#//Action" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ActionLiteral" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ValueActionLiteral" eSuperTypes="#//ActionLiteral">
+  <eClassifiers xsi:type="ecore:EClass" name="Action" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="AssertionAction" eSuperTypes="#//Action">
     <eStructuralFeatures xsi:type="ecore:EReference" name="atom" eType="#//Atom" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//LogicValue"
         defaultValueLiteral="TRUE"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="refinement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="overwrite" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="FALSE"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DeleteActionLiteral" eSuperTypes="#//ActionLiteral">
+  <eClassifiers xsi:type="ecore:EClass" name="DeleteAction" eSuperTypes="#//Action">
     <eStructuralFeatures xsi:type="ecore:EReference" name="variableOrNode" eType="#//VariableOrNode"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NewActionLiteral" eSuperTypes="#//ActionLiteral">
+  <eClassifiers xsi:type="ecore:EClass" name="NewAction" eSuperTypes="#//Action">
     <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//NewVariable"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//VariableOrNode"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="NewVariable" eSuperTypes="#//Variable"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CompoundLiteral" abstract="true" eSuperTypes="#//Literal">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="atom" eType="#//Atom" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ValueLiteral" eSuperTypes="#//CompoundLiteral">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
-        eType="#//LogicConstant" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="refinement" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LogicConstant">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//LogicValue"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="PredicateKind">
-    <eLiterals name="PARTIAL"/>
-    <eLiterals name="DIRECT" value="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="RuleKind">
-    <eLiterals name="DIRECT"/>
+  <eClassifiers xsi:type="ecore:EEnum" name="Modality">
+    <eLiterals name="DEFAULT"/>
+    <eLiterals name="MAY" value="1"/>
+    <eLiterals name="MUST" value="2"/>
+    <eLiterals name="CURRENT" value="3"/>
   </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 9ba2274b..5a1da4d4 100644
--- a/subprojects/language-model/src/main/resources/model/problem.genmodel
+++ b/subprojects/language-model/src/main/resources/model/problem.genmodel
@@ -16,12 +16,11 @@
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LogicValue/UNKNOWN"/>
       <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LogicValue/ERROR"/>
     </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//PredicateKind">
-      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/PARTIAL"/>
-      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//PredicateKind/DIRECT"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//RuleKind">
-      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//RuleKind/DIRECT"/>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//Modality">
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//Modality/DEFAULT"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//Modality/MAY"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//Modality/MUST"/>
+      <genEnumLiterals ecoreEnumLiteral="problem.ecore#//Modality/CURRENT"/>
     </genEnums>
     <genClasses ecoreClass="problem.ecore#//Problem">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/nodes"/>
@@ -45,7 +44,6 @@
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//PredicateDefinition">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//PredicateDefinition/error"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//PredicateDefinition/kind"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//Parameter">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Parameter/parameterType"/>
@@ -54,14 +52,18 @@
     <genClasses ecoreClass="problem.ecore#//Conjunction">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Conjunction/literals"/>
     </genClasses>
-    <genClasses ecoreClass="problem.ecore#//Literal"/>
+    <genClasses ecoreClass="problem.ecore#//Literal">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Literal/modality"/>
+    </genClasses>
     <genClasses ecoreClass="problem.ecore#//Atom">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Atom/relation"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Atom/transitiveClosure"/>
       <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Atom/arguments"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//ImplicitVariable"/>
-    <genClasses ecoreClass="problem.ecore#//NegativeLiteral"/>
+    <genClasses ecoreClass="problem.ecore#//NegativeLiteral">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//NegativeLiteral/atom"/>
+    </genClasses>
     <genClasses ecoreClass="problem.ecore#//ExistentialQuantifier">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ExistentialQuantifier/implicitVariables"/>
     </genClasses>
@@ -132,34 +134,24 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ParametricDefinition/parameters"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//RuleDefinition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//RuleDefinition/kind"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//RuleDefinition/action"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//RuleDefinition/consequents"/>
     </genClasses>
-    <genClasses ecoreClass="problem.ecore#//Action">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Action/actionLiterals"/>
+    <genClasses ecoreClass="problem.ecore#//Consequent">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Consequent/actions"/>
     </genClasses>
-    <genClasses ecoreClass="problem.ecore#//ActionLiteral"/>
-    <genClasses ecoreClass="problem.ecore#//ValueActionLiteral">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ValueActionLiteral/atom"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ValueActionLiteral/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ValueActionLiteral/refinement"/>
+    <genClasses ecoreClass="problem.ecore#//Action"/>
+    <genClasses ecoreClass="problem.ecore#//AssertionAction">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//AssertionAction/atom"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//AssertionAction/value"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//AssertionAction/overwrite"/>
     </genClasses>
-    <genClasses ecoreClass="problem.ecore#//DeleteActionLiteral">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//DeleteActionLiteral/variableOrNode"/>
+    <genClasses ecoreClass="problem.ecore#//DeleteAction">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//DeleteAction/variableOrNode"/>
     </genClasses>
-    <genClasses ecoreClass="problem.ecore#//NewActionLiteral">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//NewActionLiteral/variable"/>
+    <genClasses ecoreClass="problem.ecore#//NewAction">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//NewAction/variable"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//NewAction/parent"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//NewVariable"/>
-    <genClasses ecoreClass="problem.ecore#//CompoundLiteral">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//CompoundLiteral/atom"/>
-    </genClasses>
-    <genClasses ecoreClass="problem.ecore#//ValueLiteral">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ValueLiteral/values"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ValueLiteral/refinement"/>
-    </genClasses>
-    <genClasses ecoreClass="problem.ecore#//LogicConstant">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//LogicConstant/value"/>
-    </genClasses>
   </genPackages>
 </genmodel:GenModel>