8 files changed, 508 insertions, 322 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDeclarationImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDeclarationImpl.java
index bb913d80..894c76de 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDeclarationImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDeclarationImpl.java
@@ -4,20 +4,43 @@
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
 
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDeclaration;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;
 
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>VLS Declaration</b></em>'.
  * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDeclarationImpl#getType <em>Type</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class VLSDeclarationImpl extends VLSTffTermImpl implements VLSDeclaration
 {
   /**
+   * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getType()
+   * @generated
+   * @ordered
+   */
+  protected VLSTypeDef type;
+
+  /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
@@ -38,4 +61,134 @@ public class VLSDeclarationImpl extends VLSTffTermImpl implements VLSDeclaration
     return VampireLanguagePackage.Literals.VLS_DECLARATION;
   }
 
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public VLSTypeDef getType()
+  {
+    return type;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetType(VLSTypeDef newType, NotificationChain msgs)
+  {
+    VLSTypeDef oldType = type;
+    type = newType;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_DECLARATION__TYPE, oldType, newType);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setType(VLSTypeDef newType)
+  {
+    if (newType != type)
+    {
+      NotificationChain msgs = null;
+      if (type != null)
+        msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_DECLARATION__TYPE, null, msgs);
+      if (newType != null)
+        msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_DECLARATION__TYPE, null, msgs);
+      msgs = basicSetType(newType, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_DECLARATION__TYPE, newType, newType));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_DECLARATION__TYPE:
+        return basicSetType(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_DECLARATION__TYPE:
+        return getType();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_DECLARATION__TYPE:
+        setType((VLSTypeDef)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_DECLARATION__TYPE:
+        setType((VLSTypeDef)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_DECLARATION__TYPE:
+        return type != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
 } //VLSDeclarationImpl
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java
index 115c7a23..6d71ec60 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java
@@ -5,7 +5,7 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
 

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

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

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

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

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

 

 import java.util.Collection;

@@ -47,7 +47,7 @@ public class VLSExistentialQuantifierImpl extends VLSTermImpl implements VLSExis
    * @generated

    * @ordered

    */

-  protected EList<VLSVariableDeclaration> variables;

+  protected EList<VLSTffTerm> variables;

 

   /**

    * The cached value of the '{@link #getOperand() <em>Operand</em>}' containment reference.

@@ -85,11 +85,11 @@ public class VLSExistentialQuantifierImpl extends VLSTermImpl implements VLSExis
    * <!-- end-user-doc -->

    * @generated

    */

-  public EList<VLSVariableDeclaration> getVariables()

+  public EList<VLSTffTerm> getVariables()

   {

     if (variables == null)

     {

-      variables = new EObjectContainmentEList<VLSVariableDeclaration>(VLSVariableDeclaration.class, this, VampireLanguagePackage.VLS_EXISTENTIAL_QUANTIFIER__VARIABLES);

+      variables = new EObjectContainmentEList<VLSTffTerm>(VLSTffTerm.class, this, VampireLanguagePackage.VLS_EXISTENTIAL_QUANTIFIER__VARIABLES);

     }

     return variables;

   }

@@ -191,7 +191,7 @@ public class VLSExistentialQuantifierImpl extends VLSTermImpl implements VLSExis
     {

       case VampireLanguagePackage.VLS_EXISTENTIAL_QUANTIFIER__VARIABLES:

         getVariables().clear();

-        getVariables().addAll((Collection<? extends VLSVariableDeclaration>)newValue);

+        getVariables().addAll((Collection<? extends VLSTffTerm>)newValue);

         return;

       case VampireLanguagePackage.VLS_EXISTENTIAL_QUANTIFIER__OPERAND:

         setOperand((VLSTerm)newValue);

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOtherDeclarationImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOtherDeclarationImpl.java
index c5abc76a..eb7afd3d 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOtherDeclarationImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOtherDeclarationImpl.java
@@ -4,20 +4,43 @@
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
 
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOtherDeclaration;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;
 
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>VLS Other Declaration</b></em>'.
  * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSOtherDeclarationImpl#getName <em>Name</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class VLSOtherDeclarationImpl extends VLSDeclarationImpl implements VLSOtherDeclaration
 {
   /**
+   * The cached value of the '{@link #getName() <em>Name</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected VLSTerm name;
+
+  /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
@@ -38,4 +61,134 @@ public class VLSOtherDeclarationImpl extends VLSDeclarationImpl implements VLSOt
     return VampireLanguagePackage.Literals.VLS_OTHER_DECLARATION;
   }
 
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public VLSTerm getName()
+  {
+    return name;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetName(VLSTerm newName, NotificationChain msgs)
+  {
+    VLSTerm oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME, oldName, newName);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setName(VLSTerm newName)
+  {
+    if (newName != name)
+    {
+      NotificationChain msgs = null;
+      if (name != null)
+        msgs = ((InternalEObject)name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME, null, msgs);
+      if (newName != null)
+        msgs = ((InternalEObject)newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME, null, msgs);
+      msgs = basicSetName(newName, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME, newName, newName));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME:
+        return basicSetName(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME:
+        return getName();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME:
+        setName((VLSTerm)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME:
+        setName((VLSTerm)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME:
+        return name != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
 } //VLSOtherDeclarationImpl
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java
index 0ea49b4c..c56d7ecd 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java
@@ -4,43 +4,20 @@
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;

 

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

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

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

 

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

 

 /**

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

  * An implementation of the model object '<em><b>VLS Term</b></em>'.

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

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTermImpl#getType <em>Type</em>}</li>

- * </ul>

  *

  * @generated

  */

 public class VLSTermImpl extends VLSTffTermImpl implements VLSTerm

 {

   /**

-   * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.

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

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

-   * @see #getType()

-   * @generated

-   * @ordered

-   */

-  protected VLSTypeDef type;

-

-  /**

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

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

    * @generated

@@ -61,134 +38,4 @@ public class VLSTermImpl extends VLSTffTermImpl implements VLSTerm
     return VampireLanguagePackage.Literals.VLS_TERM;

   }

 

-  /**

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

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

-   * @generated

-   */

-  public VLSTypeDef getType()

-  {

-    return type;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  public NotificationChain basicSetType(VLSTypeDef newType, NotificationChain msgs)

-  {

-    VLSTypeDef oldType = type;

-    type = newType;

-    if (eNotificationRequired())

-    {

-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TERM__TYPE, oldType, newType);

-      if (msgs == null) msgs = notification; else msgs.add(notification);

-    }

-    return msgs;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  public void setType(VLSTypeDef newType)

-  {

-    if (newType != type)

-    {

-      NotificationChain msgs = null;

-      if (type != null)

-        msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_TERM__TYPE, null, msgs);

-      if (newType != null)

-        msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_TERM__TYPE, null, msgs);

-      msgs = basicSetType(newType, msgs);

-      if (msgs != null) msgs.dispatch();

-    }

-    else if (eNotificationRequired())

-      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TERM__TYPE, newType, newType));

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_TERM__TYPE:

-        return basicSetType(null, msgs);

-    }

-    return super.eInverseRemove(otherEnd, featureID, msgs);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public Object eGet(int featureID, boolean resolve, boolean coreType)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_TERM__TYPE:

-        return getType();

-    }

-    return super.eGet(featureID, resolve, coreType);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public void eSet(int featureID, Object newValue)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_TERM__TYPE:

-        setType((VLSTypeDef)newValue);

-        return;

-    }

-    super.eSet(featureID, newValue);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public void eUnset(int featureID)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_TERM__TYPE:

-        setType((VLSTypeDef)null);

-        return;

-    }

-    super.eUnset(featureID);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public boolean eIsSet(int featureID)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_TERM__TYPE:

-        return type != null;

-    }

-    return super.eIsSet(featureID);

-  }

-

 } //VLSTermImpl

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java
index b9bfbe07..e3482fb8 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java
@@ -4,8 +4,8 @@
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;

 

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

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

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

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

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

 

 import java.util.Collection;

@@ -47,7 +47,7 @@ public class VLSUniversalQuantifierImpl extends VLSTermImpl implements VLSUniver
    * @generated

    * @ordered

    */

-  protected EList<VLSVariableDeclaration> variables;

+  protected EList<VLSTffTerm> variables;

 

   /**

    * The cached value of the '{@link #getOperand() <em>Operand</em>}' containment reference.

@@ -85,11 +85,11 @@ public class VLSUniversalQuantifierImpl extends VLSTermImpl implements VLSUniver
    * <!-- end-user-doc -->

    * @generated

    */

-  public EList<VLSVariableDeclaration> getVariables()

+  public EList<VLSTffTerm> getVariables()

   {

     if (variables == null)

     {

-      variables = new EObjectContainmentEList<VLSVariableDeclaration>(VLSVariableDeclaration.class, this, VampireLanguagePackage.VLS_UNIVERSAL_QUANTIFIER__VARIABLES);

+      variables = new EObjectContainmentEList<VLSTffTerm>(VLSTffTerm.class, this, VampireLanguagePackage.VLS_UNIVERSAL_QUANTIFIER__VARIABLES);

     }

     return variables;

   }

@@ -191,7 +191,7 @@ public class VLSUniversalQuantifierImpl extends VLSTermImpl implements VLSUniver
     {

       case VampireLanguagePackage.VLS_UNIVERSAL_QUANTIFIER__VARIABLES:

         getVariables().clear();

-        getVariables().addAll((Collection<? extends VLSVariableDeclaration>)newValue);

+        getVariables().addAll((Collection<? extends VLSTffTerm>)newValue);

         return;

       case VampireLanguagePackage.VLS_UNIVERSAL_QUANTIFIER__OPERAND:

         setOperand((VLSTerm)newValue);

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableDeclarationImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableDeclarationImpl.java
index 0e6c0ef9..5ebb84c7 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableDeclarationImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableDeclarationImpl.java
@@ -3,21 +3,44 @@
  */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
 
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;
 
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>VLS Variable Declaration</b></em>'.
  * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableDeclarationImpl#getName <em>Name</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class VLSVariableDeclarationImpl extends VLSDeclarationImpl implements VLSVariableDeclaration
 {
   /**
+   * The cached value of the '{@link #getName() <em>Name</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected VLSVariable name;
+
+  /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
@@ -38,4 +61,134 @@ public class VLSVariableDeclarationImpl extends VLSDeclarationImpl implements VL
     return VampireLanguagePackage.Literals.VLS_VARIABLE_DECLARATION;
   }
 
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public VLSVariable getName()
+  {
+    return name;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetName(VLSVariable newName, NotificationChain msgs)
+  {
+    VLSVariable oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME, oldName, newName);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setName(VLSVariable newName)
+  {
+    if (newName != name)
+    {
+      NotificationChain msgs = null;
+      if (name != null)
+        msgs = ((InternalEObject)name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME, null, msgs);
+      if (newName != null)
+        msgs = ((InternalEObject)newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME, null, msgs);
+      msgs = basicSetName(newName, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME, newName, newName));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME:
+        return basicSetName(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME:
+        return getName();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME:
+        setName((VLSVariable)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME:
+        setName((VLSVariable)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME:
+        return name != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
 } //VLSVariableDeclarationImpl
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java
index 1d38ddfb..9ebed3eb 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java
@@ -3,17 +3,12 @@
  */

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

 

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

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

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

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

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

 

 import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

 

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

 

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 

@@ -25,25 +20,14 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:

  * </p>

  * <ul>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableImpl#getType <em>Type</em>}</li>

  *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableImpl#getName <em>Name</em>}</li>

  * </ul>

  *

  * @generated

  */

-public class VLSVariableImpl extends VLSVariableDeclarationImpl implements VLSVariable

+public class VLSVariableImpl extends VLSTermImpl implements VLSVariable

 {

   /**

-   * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.

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

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

-   * @see #getType()

-   * @generated

-   * @ordered

-   */

-  protected VLSTypeDef type;

-

-  /**

    * The default value of the '{@link #getName() <em>Name</em>}' attribute.

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

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

@@ -89,54 +73,6 @@ public class VLSVariableImpl extends VLSVariableDeclarationImpl implements VLSVa
    * <!-- end-user-doc -->

    * @generated

    */

-  public VLSTypeDef getType()

-  {

-    return type;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  public NotificationChain basicSetType(VLSTypeDef newType, NotificationChain msgs)

-  {

-    VLSTypeDef oldType = type;

-    type = newType;

-    if (eNotificationRequired())

-    {

-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_VARIABLE__TYPE, oldType, newType);

-      if (msgs == null) msgs = notification; else msgs.add(notification);

-    }

-    return msgs;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  public void setType(VLSTypeDef newType)

-  {

-    if (newType != type)

-    {

-      NotificationChain msgs = null;

-      if (type != null)

-        msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_VARIABLE__TYPE, null, msgs);

-      if (newType != null)

-        msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_VARIABLE__TYPE, null, msgs);

-      msgs = basicSetType(newType, msgs);

-      if (msgs != null) msgs.dispatch();

-    }

-    else if (eNotificationRequired())

-      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_VARIABLE__TYPE, newType, newType));

-  }

-

-  /**

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

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

-   * @generated

-   */

   public String getName()

   {

     return name;

@@ -161,28 +97,10 @@ public class VLSVariableImpl extends VLSVariableDeclarationImpl implements VLSVa
    * @generated

    */

   @Override

-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_VARIABLE__TYPE:

-        return basicSetType(null, msgs);

-    }

-    return super.eInverseRemove(otherEnd, featureID, msgs);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

   public Object eGet(int featureID, boolean resolve, boolean coreType)

   {

     switch (featureID)

     {

-      case VampireLanguagePackage.VLS_VARIABLE__TYPE:

-        return getType();

       case VampireLanguagePackage.VLS_VARIABLE__NAME:

         return getName();

     }

@@ -199,9 +117,6 @@ public class VLSVariableImpl extends VLSVariableDeclarationImpl implements VLSVa
   {

     switch (featureID)

     {

-      case VampireLanguagePackage.VLS_VARIABLE__TYPE:

-        setType((VLSTypeDef)newValue);

-        return;

       case VampireLanguagePackage.VLS_VARIABLE__NAME:

         setName((String)newValue);

         return;

@@ -219,9 +134,6 @@ public class VLSVariableImpl extends VLSVariableDeclarationImpl implements VLSVa
   {

     switch (featureID)

     {

-      case VampireLanguagePackage.VLS_VARIABLE__TYPE:

-        setType((VLSTypeDef)null);

-        return;

       case VampireLanguagePackage.VLS_VARIABLE__NAME:

         setName(NAME_EDEFAULT);

         return;

@@ -239,8 +151,6 @@ public class VLSVariableImpl extends VLSVariableDeclarationImpl implements VLSVa
   {

     switch (featureID)

     {

-      case VampireLanguagePackage.VLS_VARIABLE__TYPE:

-        return type != null;

       case VampireLanguagePackage.VLS_VARIABLE__NAME:

         return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

     }

@@ -253,58 +163,6 @@ public class VLSVariableImpl extends VLSVariableDeclarationImpl implements VLSVa
    * @generated

    */

   @Override

-  public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)

-  {

-    if (baseClass == VLSOtherDeclaration.class)

-    {

-      switch (derivedFeatureID)

-      {

-        default: return -1;

-      }

-    }

-    if (baseClass == VLSTerm.class)

-    {

-      switch (derivedFeatureID)

-      {

-        case VampireLanguagePackage.VLS_VARIABLE__TYPE: return VampireLanguagePackage.VLS_TERM__TYPE;

-        default: return -1;

-      }

-    }

-    return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)

-  {

-    if (baseClass == VLSOtherDeclaration.class)

-    {

-      switch (baseFeatureID)

-      {

-        default: return -1;

-      }

-    }

-    if (baseClass == VLSTerm.class)

-    {

-      switch (baseFeatureID)

-      {

-        case VampireLanguagePackage.VLS_TERM__TYPE: return VampireLanguagePackage.VLS_VARIABLE__TYPE;

-        default: return -1;

-      }

-    }

-    return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

   public String toString()

   {

     if (eIsProxy()) return super.toString();

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 6b2b7085..676b2786 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
@@ -649,6 +649,16 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

+  public EReference getVLSDeclaration_Type()

+  {

+    return (EReference)vlsDeclarationEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

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

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

+   * @generated

+   */

   public EClass getVLSOtherDeclaration()

   {

     return vlsOtherDeclarationEClass;

@@ -659,6 +669,16 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

+  public EReference getVLSOtherDeclaration_Name()

+  {

+    return (EReference)vlsOtherDeclarationEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

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

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

+   * @generated

+   */

   public EClass getVLSVariableDeclaration()

   {

     return vlsVariableDeclarationEClass;

@@ -669,6 +689,16 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

+  public EReference getVLSVariableDeclaration_Name()

+  {

+    return (EReference)vlsVariableDeclarationEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

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

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

+   * @generated

+   */

   public EClass getVLSTypeDef()

   {

     return vlsTypeDefEClass;

@@ -729,16 +759,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public EReference getVLSTerm_Type()

-  {

-    return (EReference)vlsTermEClass.getEStructuralFeatures().get(0);

-  }

-

-  /**

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

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

-   * @generated

-   */

   public EClass getVLSVariable()

   {

     return vlsVariableEClass;

@@ -1445,10 +1465,13 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     vlsTffTermEClass = createEClass(VLS_TFF_TERM);

 

     vlsDeclarationEClass = createEClass(VLS_DECLARATION);

+    createEReference(vlsDeclarationEClass, VLS_DECLARATION__TYPE);

 

     vlsOtherDeclarationEClass = createEClass(VLS_OTHER_DECLARATION);

+    createEReference(vlsOtherDeclarationEClass, VLS_OTHER_DECLARATION__NAME);

 

     vlsVariableDeclarationEClass = createEClass(VLS_VARIABLE_DECLARATION);

+    createEReference(vlsVariableDeclarationEClass, VLS_VARIABLE_DECLARATION__NAME);

 

     vlsTypeDefEClass = createEClass(VLS_TYPE_DEF);

     createEReference(vlsTypeDefEClass, VLS_TYPE_DEF__TYPE_SIG);

@@ -1457,7 +1480,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     createEReference(vlsTypeDefEClass, VLS_TYPE_DEF__NEXT_TYPE);

 

     vlsTermEClass = createEClass(VLS_TERM);

-    createEReference(vlsTermEClass, VLS_TERM__TYPE);

 

     vlsVariableEClass = createEClass(VLS_VARIABLE);

     createEAttribute(vlsVariableEClass, VLS_VARIABLE__NAME);

@@ -1586,8 +1608,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     vlsOtherDeclarationEClass.getESuperTypes().add(this.getVLSDeclaration());

     vlsVariableDeclarationEClass.getESuperTypes().add(this.getVLSDeclaration());

     vlsTermEClass.getESuperTypes().add(this.getVLSTffTerm());

-    vlsTermEClass.getESuperTypes().add(this.getVLSOtherDeclaration());

-    vlsVariableEClass.getESuperTypes().add(this.getVLSVariableDeclaration());

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

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

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

@@ -1649,10 +1669,13 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     initEClass(vlsTffTermEClass, VLSTffTerm.class, "VLSTffTerm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

     initEClass(vlsDeclarationEClass, VLSDeclaration.class, "VLSDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getVLSDeclaration_Type(), this.getVLSTypeDef(), null, "type", null, 0, 1, VLSDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsOtherDeclarationEClass, VLSOtherDeclaration.class, "VLSOtherDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getVLSOtherDeclaration_Name(), this.getVLSTerm(), null, "name", null, 0, 1, VLSOtherDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsVariableDeclarationEClass, VLSVariableDeclaration.class, "VLSVariableDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getVLSVariableDeclaration_Name(), this.getVLSVariable(), null, "name", null, 0, 1, VLSVariableDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsTypeDefEClass, VLSTypeDef.class, "VLSTypeDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEReference(getVLSTypeDef_TypeSig(), this.getVLSTypeDef(), null, "typeSig", null, 0, 1, VLSTypeDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

@@ -1661,7 +1684,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     initEReference(getVLSTypeDef_NextType(), this.getVLSTerm(), null, "nextType", null, 0, 1, VLSTypeDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsTermEClass, VLSTerm.class, "VLSTerm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-    initEReference(getVLSTerm_Type(), this.getVLSTypeDef(), null, "type", null, 0, 1, VLSTerm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     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);

@@ -1715,11 +1737,11 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     initEReference(getVLSOr_Right(), this.getVLSTerm(), null, "right", null, 0, 1, VLSOr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsUniversalQuantifierEClass, VLSUniversalQuantifier.class, "VLSUniversalQuantifier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-    initEReference(getVLSUniversalQuantifier_Variables(), this.getVLSVariableDeclaration(), null, "variables", null, 0, -1, VLSUniversalQuantifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getVLSUniversalQuantifier_Variables(), this.getVLSTffTerm(), null, "variables", null, 0, -1, VLSUniversalQuantifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEReference(getVLSUniversalQuantifier_Operand(), this.getVLSTerm(), null, "operand", null, 0, 1, VLSUniversalQuantifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsExistentialQuantifierEClass, VLSExistentialQuantifier.class, "VLSExistentialQuantifier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-    initEReference(getVLSExistentialQuantifier_Variables(), this.getVLSVariableDeclaration(), null, "variables", null, 0, -1, VLSExistentialQuantifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getVLSExistentialQuantifier_Variables(), this.getVLSTffTerm(), null, "variables", null, 0, -1, VLSExistentialQuantifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEReference(getVLSExistentialQuantifier_Operand(), this.getVLSTerm(), null, "operand", null, 0, 1, VLSExistentialQuantifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsUnaryNegationEClass, VLSUnaryNegation.class, "VLSUnaryNegation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);