1 files changed, 19 insertions, 19 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java
index 2b131272..2907b35d 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java
@@ -1,5 +1,5 @@
 /**

- * generated by Xtext 2.12.0

+ * generated by Xtext 2.14.0

  */

 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;

 

@@ -17,7 +17,7 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFalse;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction;

-import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionFof;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality;

@@ -139,7 +139,7 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  private EClass vlsFunctionFofEClass = null;

+  private EClass vlsFunctionAsTermEClass = null;

 

   /**

    * <!-- begin-user-doc -->

@@ -338,7 +338,7 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
 

   /**

    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-   * 

+   *

    * <p>This method is used to initialize {@link VampireLanguagePackage#eINSTANCE} when that field is accessed.

    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

    * <!-- begin-user-doc -->

@@ -353,7 +353,8 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     if (isInited) return (VampireLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(VampireLanguagePackage.eNS_URI);

 

     // Obtain or create and register package

-    VampireLanguagePackageImpl theVampireLanguagePackage = (VampireLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VampireLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new VampireLanguagePackageImpl());

+    Object registeredVampireLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI);

+    VampireLanguagePackageImpl theVampireLanguagePackage = registeredVampireLanguagePackage instanceof VampireLanguagePackageImpl ? (VampireLanguagePackageImpl)registeredVampireLanguagePackage : new VampireLanguagePackageImpl();

 

     isInited = true;

 

@@ -366,7 +367,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     // Mark meta-data to indicate it can't be changed

     theVampireLanguagePackage.freeze();

 

-  

     // Update the registry and return the package

     EPackage.Registry.INSTANCE.put(VampireLanguagePackage.eNS_URI, theVampireLanguagePackage);

     return theVampireLanguagePackage;

@@ -697,9 +697,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public EClass getVLSFunctionFof()

+  public EClass getVLSFunctionAsTerm()

   {

-    return vlsFunctionFofEClass;

+    return vlsFunctionAsTermEClass;

   }

 

   /**

@@ -707,9 +707,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public EAttribute getVLSFunctionFof_Functor()

+  public EAttribute getVLSFunctionAsTerm_Functor()

   {

-    return (EAttribute)vlsFunctionFofEClass.getEStructuralFeatures().get(0);

+    return (EAttribute)vlsFunctionAsTermEClass.getEStructuralFeatures().get(0);

   }

 

   /**

@@ -717,9 +717,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public EReference getVLSFunctionFof_Terms()

+  public EReference getVLSFunctionAsTerm_Terms()

   {

-    return (EReference)vlsFunctionFofEClass.getEStructuralFeatures().get(1);

+    return (EReference)vlsFunctionAsTermEClass.getEStructuralFeatures().get(1);

   }

 

   /**

@@ -1365,9 +1365,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     vlsVariableEClass = createEClass(VLS_VARIABLE);

     createEAttribute(vlsVariableEClass, VLS_VARIABLE__NAME);

 

-    vlsFunctionFofEClass = createEClass(VLS_FUNCTION_FOF);

-    createEAttribute(vlsFunctionFofEClass, VLS_FUNCTION_FOF__FUNCTOR);

-    createEReference(vlsFunctionFofEClass, VLS_FUNCTION_FOF__TERMS);

+    vlsFunctionAsTermEClass = createEClass(VLS_FUNCTION_AS_TERM);

+    createEAttribute(vlsFunctionAsTermEClass, VLS_FUNCTION_AS_TERM__FUNCTOR);

+    createEReference(vlsFunctionAsTermEClass, VLS_FUNCTION_AS_TERM__TERMS);

 

     vlsDefinedTermEClass = createEClass(VLS_DEFINED_TERM);

     createEAttribute(vlsDefinedTermEClass, VLS_DEFINED_TERM__VALUE);

@@ -1482,7 +1482,7 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     // Add supertypes to classes

     vlsSatisfiableEClass.getESuperTypes().add(this.getVLSConfirmations());

     vlsVariableEClass.getESuperTypes().add(this.getVLSTerm());

-    vlsFunctionFofEClass.getESuperTypes().add(this.getVLSTerm());

+    vlsFunctionAsTermEClass.getESuperTypes().add(this.getVLSTerm());

     vlsDefinedTermEClass.getESuperTypes().add(this.getVLSTerm());

     vlsEquivalentEClass.getESuperTypes().add(this.getVLSTerm());

     vlsImpliesEClass.getESuperTypes().add(this.getVLSTerm());

@@ -1552,9 +1552,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     initEClass(vlsVariableEClass, VLSVariable.class, "VLSVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEAttribute(getVLSVariable_Name(), ecorePackage.getEString(), "name", null, 0, 1, VLSVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-    initEClass(vlsFunctionFofEClass, VLSFunctionFof.class, "VLSFunctionFof", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-    initEAttribute(getVLSFunctionFof_Functor(), ecorePackage.getEString(), "functor", null, 0, 1, VLSFunctionFof.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-    initEReference(getVLSFunctionFof_Terms(), this.getVLSTerm(), null, "terms", null, 0, -1, VLSFunctionFof.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEClass(vlsFunctionAsTermEClass, VLSFunctionAsTerm.class, "VLSFunctionAsTerm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getVLSFunctionAsTerm_Functor(), ecorePackage.getEString(), "functor", null, 0, 1, VLSFunctionAsTerm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getVLSFunctionAsTerm_Terms(), this.getVLSTerm(), null, "terms", null, 0, -1, VLSFunctionAsTerm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsDefinedTermEClass, VLSDefinedTerm.class, "VLSDefinedTerm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEAttribute(getVLSDefinedTerm_Value(), ecorePackage.getEString(), "value", null, 0, 1, VLSDefinedTerm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);