2 files changed, 43 insertions, 43 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageAdapterFactory.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageAdapterFactory.java
index 92b5a89d..9156e24f 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageAdapterFactory.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageAdapterFactory.java
@@ -111,6 +111,11 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl
         return createVLSTffTermAdapter();

       }

       @Override

+      public Adapter caseVLSTerm(VLSTerm object)

+      {

+        return createVLSTermAdapter();

+      }

+      @Override

       public Adapter caseVLSDeclaration(VLSDeclaration object)

       {

         return createVLSDeclarationAdapter();

@@ -131,11 +136,6 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl
         return createVLSTypeDefAdapter();

       }

       @Override

-      public Adapter caseVLSTerm(VLSTerm object)

-      {

-        return createVLSTermAdapter();

-      }

-      @Override

       public Adapter caseVLSVariable(VLSVariable object)

       {

         return createVLSVariableAdapter();

@@ -403,76 +403,76 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl
   }

 

   /**

-   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDeclaration <em>VLS Declaration</em>}'.

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm <em>VLS Term</em>}'.

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

    * This default implementation returns null so that we can easily ignore cases;

    * it's useful to ignore a case when inheritance will catch all the cases anyway.

    * <!-- end-user-doc -->

    * @return the new adapter.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDeclaration

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm

    * @generated

    */

-  public Adapter createVLSDeclarationAdapter()

+  public Adapter createVLSTermAdapter()

   {

     return null;

   }

 

   /**

-   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOtherDeclaration <em>VLS Other Declaration</em>}'.

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDeclaration <em>VLS Declaration</em>}'.

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

    * This default implementation returns null so that we can easily ignore cases;

    * it's useful to ignore a case when inheritance will catch all the cases anyway.

    * <!-- end-user-doc -->

    * @return the new adapter.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOtherDeclaration

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDeclaration

    * @generated

    */

-  public Adapter createVLSOtherDeclarationAdapter()

+  public Adapter createVLSDeclarationAdapter()

   {

     return null;

   }

 

   /**

-   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration <em>VLS Variable Declaration</em>}'.

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOtherDeclaration <em>VLS Other Declaration</em>}'.

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

    * This default implementation returns null so that we can easily ignore cases;

    * it's useful to ignore a case when inheritance will catch all the cases anyway.

    * <!-- end-user-doc -->

    * @return the new adapter.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOtherDeclaration

    * @generated

    */

-  public Adapter createVLSVariableDeclarationAdapter()

+  public Adapter createVLSOtherDeclarationAdapter()

   {

     return null;

   }

 

   /**

-   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef <em>VLS Type Def</em>}'.

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration <em>VLS Variable Declaration</em>}'.

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

    * This default implementation returns null so that we can easily ignore cases;

    * it's useful to ignore a case when inheritance will catch all the cases anyway.

    * <!-- end-user-doc -->

    * @return the new adapter.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration

    * @generated

    */

-  public Adapter createVLSTypeDefAdapter()

+  public Adapter createVLSVariableDeclarationAdapter()

   {

     return null;

   }

 

   /**

-   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm <em>VLS Term</em>}'.

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef <em>VLS Type Def</em>}'.

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

    * This default implementation returns null so that we can easily ignore cases;

    * it's useful to ignore a case when inheritance will catch all the cases anyway.

    * <!-- end-user-doc -->

    * @return the new adapter.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef

    * @generated

    */

-  public Adapter createVLSTermAdapter()

+  public Adapter createVLSTypeDefAdapter()

   {

     return null;

   }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java
index 193ac81b..e8c0fde1 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java
@@ -122,6 +122,14 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         if (result == null) result = defaultCase(theEObject);

         return result;

       }

+      case VampireLanguagePackage.VLS_TERM:

+      {

+        VLSTerm vlsTerm = (VLSTerm)theEObject;

+        T result = caseVLSTerm(vlsTerm);

+        if (result == null) result = caseVLSTffTerm(vlsTerm);

+        if (result == null) result = defaultCase(theEObject);

+        return result;

+      }

       case VampireLanguagePackage.VLS_DECLARATION:

       {

         VLSDeclaration vlsDeclaration = (VLSDeclaration)theEObject;

@@ -155,14 +163,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         if (result == null) result = defaultCase(theEObject);

         return result;

       }

-      case VampireLanguagePackage.VLS_TERM:

-      {

-        VLSTerm vlsTerm = (VLSTerm)theEObject;

-        T result = caseVLSTerm(vlsTerm);

-        if (result == null) result = caseVLSTffTerm(vlsTerm);

-        if (result == null) result = defaultCase(theEObject);

-        return result;

-      }

       case VampireLanguagePackage.VLS_VARIABLE:

       {

         VLSVariable vlsVariable = (VLSVariable)theEObject;

@@ -530,81 +530,81 @@ public class VampireLanguageSwitch<T> extends Switch<T>
   }

 

   /**

-   * Returns the result of interpreting the object as an instance of '<em>VLS Declaration</em>'.

+   * Returns the result of interpreting the object as an instance of '<em>VLS Term</em>'.

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

    * This implementation returns null;

    * returning a non-null result will terminate the switch.

    * <!-- end-user-doc -->

    * @param object the target of the switch.

-   * @return the result of interpreting the object as an instance of '<em>VLS Declaration</em>'.

+   * @return the result of interpreting the object as an instance of '<em>VLS Term</em>'.

    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

    * @generated

    */

-  public T caseVLSDeclaration(VLSDeclaration object)

+  public T caseVLSTerm(VLSTerm object)

   {

     return null;

   }

 

   /**

-   * Returns the result of interpreting the object as an instance of '<em>VLS Other Declaration</em>'.

+   * Returns the result of interpreting the object as an instance of '<em>VLS Declaration</em>'.

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

    * This implementation returns null;

    * returning a non-null result will terminate the switch.

    * <!-- end-user-doc -->

    * @param object the target of the switch.

-   * @return the result of interpreting the object as an instance of '<em>VLS Other Declaration</em>'.

+   * @return the result of interpreting the object as an instance of '<em>VLS Declaration</em>'.

    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

    * @generated

    */

-  public T caseVLSOtherDeclaration(VLSOtherDeclaration object)

+  public T caseVLSDeclaration(VLSDeclaration object)

   {

     return null;

   }

 

   /**

-   * Returns the result of interpreting the object as an instance of '<em>VLS Variable Declaration</em>'.

+   * Returns the result of interpreting the object as an instance of '<em>VLS Other Declaration</em>'.

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

    * This implementation returns null;

    * returning a non-null result will terminate the switch.

    * <!-- end-user-doc -->

    * @param object the target of the switch.

-   * @return the result of interpreting the object as an instance of '<em>VLS Variable Declaration</em>'.

+   * @return the result of interpreting the object as an instance of '<em>VLS Other Declaration</em>'.

    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

    * @generated

    */

-  public T caseVLSVariableDeclaration(VLSVariableDeclaration object)

+  public T caseVLSOtherDeclaration(VLSOtherDeclaration object)

   {

     return null;

   }

 

   /**

-   * Returns the result of interpreting the object as an instance of '<em>VLS Type Def</em>'.

+   * Returns the result of interpreting the object as an instance of '<em>VLS Variable Declaration</em>'.

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

    * This implementation returns null;

    * returning a non-null result will terminate the switch.

    * <!-- end-user-doc -->

    * @param object the target of the switch.

-   * @return the result of interpreting the object as an instance of '<em>VLS Type Def</em>'.

+   * @return the result of interpreting the object as an instance of '<em>VLS Variable Declaration</em>'.

    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

    * @generated

    */

-  public T caseVLSTypeDef(VLSTypeDef object)

+  public T caseVLSVariableDeclaration(VLSVariableDeclaration object)

   {

     return null;

   }

 

   /**

-   * Returns the result of interpreting the object as an instance of '<em>VLS Term</em>'.

+   * Returns the result of interpreting the object as an instance of '<em>VLS Type Def</em>'.

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

    * This implementation returns null;

    * returning a non-null result will terminate the switch.

    * <!-- end-user-doc -->

    * @param object the target of the switch.

-   * @return the result of interpreting the object as an instance of '<em>VLS Term</em>'.

+   * @return the result of interpreting the object as an instance of '<em>VLS Type Def</em>'.

    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

    * @generated

    */

-  public T caseVLSTerm(VLSTerm object)

+  public T caseVLSTypeDef(VLSTypeDef object)

   {

     return null;

   }