Implement Enum handling and study hierarchy handling

2 files changed, 6 insertions, 6 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 ff954f57..e529b684 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
@@ -54,7 +54,7 @@
   <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="VLSFunctionFof" eSuperTypes="#//VLSTerm">

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

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

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

         eType="#//VLSTerm" containment="true"/>

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 655f282b..ef216fb7 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
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.12.0" modelDirectory="/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.14.0" modelDirectory="/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen"

     modelPluginID="ca.mcgill.ecse.dslreasoner.vampire.language" forceOverwrite="true"

     modelName="VampireLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.13">

+    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.14">

   <genPackages prefix="VampireLanguage" basePackage="ca.mcgill.ecse.dslreasoner" disposableProviderFactory="true"

       fileExtensions="tptp" ecorePackage="VampireLanguage.ecore#/">

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

@@ -46,9 +46,9 @@
     <genClasses ecoreClass="VampireLanguage.ecore#//VLSVariable">

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

     </genClasses>

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

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSFunctionFof/functor"/>

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

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

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSFunctionAsTerm/functor"/>

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

     </genClasses>

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

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSDefinedTerm/value"/>