2 files changed, 26 insertions, 16 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore
index 0018661e..1ba1bbf7 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore
@@ -40,9 +40,18 @@
         eType="#//VLSAnnotation" containment="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="VLSTffTerm"/>

-  <eClassifiers xsi:type="ecore:EClass" name="VLSDeclaration" eSuperTypes="#//VLSTffTerm"/>

-  <eClassifiers xsi:type="ecore:EClass" name="VLSOtherDeclaration" eSuperTypes="#//VLSDeclaration"/>

-  <eClassifiers xsi:type="ecore:EClass" name="VLSVariableDeclaration" eSuperTypes="#//VLSDeclaration"/>

+  <eClassifiers xsi:type="ecore:EClass" name="VLSDeclaration" eSuperTypes="#//VLSTffTerm">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//VLSTypeDef"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="VLSOtherDeclaration" eSuperTypes="#//VLSDeclaration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="name" eType="#//VLSTerm"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="VLSVariableDeclaration" eSuperTypes="#//VLSDeclaration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="name" eType="#//VLSVariable"

+        containment="true"/>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="VLSTypeDef">

     <eStructuralFeatures xsi:type="ecore:EReference" name="typeSig" eType="#//VLSTypeDef"

         containment="true"/>

@@ -53,11 +62,8 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="nextType" eType="#//VLSTerm"

         containment="true"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="VLSTerm" eSuperTypes="#//VLSTffTerm #//VLSOtherDeclaration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//VLSTypeDef"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="VLSVariable" eSuperTypes="#//VLSVariableDeclaration #//VLSTerm">

+  <eClassifiers xsi:type="ecore:EClass" name="VLSTerm" eSuperTypes="#//VLSTffTerm"/>

+  <eClassifiers xsi:type="ecore:EClass" name="VLSVariable" eSuperTypes="#//VLSTerm">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="VLSFunctionAsTerm" eSuperTypes="#//VLSTerm">

@@ -124,13 +130,13 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="VLSUniversalQuantifier" eSuperTypes="#//VLSTerm">

     <eStructuralFeatures xsi:type="ecore:EReference" name="variables" upperBound="-1"

-        eType="#//VLSVariableDeclaration" containment="true"/>

+        eType="#//VLSTffTerm" containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="operand" eType="#//VLSTerm"

         containment="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="VLSExistentialQuantifier" eSuperTypes="#//VLSTerm">

     <eStructuralFeatures xsi:type="ecore:EReference" name="variables" upperBound="-1"

-        eType="#//VLSVariableDeclaration" containment="true"/>

+        eType="#//VLSTffTerm" containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="operand" eType="#//VLSTerm"

         containment="true"/>

   </eClassifiers>

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel
index e69b5c11..7800e85e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel
@@ -34,18 +34,22 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSAnnotation/terms"/>

     </genClasses>

     <genClasses ecoreClass="VampireLanguage.ecore#//VLSTffTerm"/>

-    <genClasses ecoreClass="VampireLanguage.ecore#//VLSDeclaration"/>

-    <genClasses ecoreClass="VampireLanguage.ecore#//VLSOtherDeclaration"/>

-    <genClasses ecoreClass="VampireLanguage.ecore#//VLSVariableDeclaration"/>

+    <genClasses ecoreClass="VampireLanguage.ecore#//VLSDeclaration">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSDeclaration/type"/>

+    </genClasses>

+    <genClasses ecoreClass="VampireLanguage.ecore#//VLSOtherDeclaration">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSOtherDeclaration/name"/>

+    </genClasses>

+    <genClasses ecoreClass="VampireLanguage.ecore#//VLSVariableDeclaration">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSVariableDeclaration/name"/>

+    </genClasses>

     <genClasses ecoreClass="VampireLanguage.ecore#//VLSTypeDef">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSTypeDef/typeSig"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSTypeDef/mapsTo"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSTypeDef/initType"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSTypeDef/nextType"/>

     </genClasses>

-    <genClasses ecoreClass="VampireLanguage.ecore#//VLSTerm">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSTerm/type"/>

-    </genClasses>

+    <genClasses ecoreClass="VampireLanguage.ecore#//VLSTerm"/>

     <genClasses ecoreClass="VampireLanguage.ecore#//VLSVariable">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSVariable/name"/>

     </genClasses>