VAMPIRE: adapt grammar to Vampire solution + get model from text

36 files changed, 3138 insertions, 1535 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDeclaration.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDeclaration.java
new file mode 100644
index 00000000..d3e5a2d5
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDeclaration.java
@@ -0,0 +1,19 @@
+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>VLS Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSDeclaration()
+ * @model
+ * @generated
+ */
+public interface VLSDeclaration extends VLSTffTerm
+{
+} // VLSDeclaration
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java
index d3a19016..a70dff64 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java
@@ -26,7 +26,7 @@ public interface VLSExistentialQuantifier extends VLSTerm
 {

   /**

    * Returns the value of the '<em><b>Variables</b></em>' containment reference list.

-   * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable}.

+   * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration}.

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

    * <p>

    * If the meaning of the '<em>Variables</em>' containment reference list isn't clear,

@@ -38,7 +38,7 @@ public interface VLSExistentialQuantifier extends VLSTerm
    * @model containment="true"

    * @generated

    */

-  EList<VLSVariable> getVariables();

+  EList<VLSVariableDeclaration> getVariables();

 

   /**

    * Returns the value of the '<em><b>Operand</b></em>' containment reference.

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFiniteModel.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFiniteModel.java
new file mode 100644
index 00000000..772a0871
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSFiniteModel.java
@@ -0,0 +1,19 @@
+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>VLS Finite Model</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSFiniteModel()
+ * @model
+ * @generated
+ */
+public interface VLSFiniteModel extends VLSConfirmations
+{
+} // VLSFiniteModel
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInclude.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInclude.java
deleted file mode 100644
index e90fbe47..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSInclude.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**

- * generated by Xtext 2.14.0

- */

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

-

-import org.eclipse.emf.common.util.EList;

-

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

-

-/**

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

- * A representation of the model object '<em><b>VLS Include</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude#getFileName <em>File Name</em>}</li>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude#getNames <em>Names</em>}</li>

- * </ul>

- *

- * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSInclude()

- * @model

- * @generated

- */

-public interface VLSInclude extends EObject

-{

-  /**

-   * Returns the value of the '<em><b>File Name</b></em>' attribute.

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

-   * <p>

-   * If the meaning of the '<em>File Name</em>' attribute isn't clear,

-   * there really should be more of a description here...

-   * </p>

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

-   * @return the value of the '<em>File Name</em>' attribute.

-   * @see #setFileName(String)

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSInclude_FileName()

-   * @model

-   * @generated

-   */

-  String getFileName();

-

-  /**

-   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude#getFileName <em>File Name</em>}' attribute.

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

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

-   * @param value the new value of the '<em>File Name</em>' attribute.

-   * @see #getFileName()

-   * @generated

-   */

-  void setFileName(String value);

-

-  /**

-   * Returns the value of the '<em><b>Names</b></em>' containment reference list.

-   * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSName}.

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

-   * <p>

-   * If the meaning of the '<em>Names</em>' containment reference list isn't clear,

-   * there really should be more of a description here...

-   * </p>

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

-   * @return the value of the '<em>Names</em>' containment reference list.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSInclude_Names()

-   * @model containment="true"

-   * @generated

-   */

-  EList<VLSName> getNames();

-

-} // VLSInclude

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOtherDeclaration.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOtherDeclaration.java
new file mode 100644
index 00000000..0ffd104d
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOtherDeclaration.java
@@ -0,0 +1,19 @@
+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>VLS Other Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSOtherDeclaration()
+ * @model
+ * @generated
+ */
+public interface VLSOtherDeclaration extends VLSDeclaration
+{
+} // VLSOtherDeclaration
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java
index 57ce9098..7a077714 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java
@@ -3,18 +3,49 @@
  */

 package ca.mcgill.ecse.dslreasoner.vampireLanguage;

 

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

 

 /**

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

  * A representation of the model object '<em><b>VLS Term</b></em>'.

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

  *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm#getType <em>Type</em>}</li>

+ * </ul>

  *

  * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTerm()

  * @model

  * @generated

  */

-public interface VLSTerm extends EObject

+public interface VLSTerm extends VLSTffTerm, VLSOtherDeclaration

 {

+  /**

+   * Returns the value of the '<em><b>Type</b></em>' containment reference.

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

+   * <p>

+   * If the meaning of the '<em>Type</em>' containment reference isn't clear,

+   * there really should be more of a description here...

+   * </p>

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

+   * @return the value of the '<em>Type</em>' containment reference.

+   * @see #setType(VLSTypeDef)

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTerm_Type()

+   * @model containment="true"

+   * @generated

+   */

+  VLSTypeDef getType();

+

+  /**

+   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm#getType <em>Type</em>}' containment reference.

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

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

+   * @param value the new value of the '<em>Type</em>' containment reference.

+   * @see #getType()

+   * @generated

+   */

+  void setType(VLSTypeDef value);

+

 } // VLSTerm

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTffFormula.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTffFormula.java
index a574b641..fa4741a0 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTffFormula.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTffFormula.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.EObject;
  * </p>

  * <ul>

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

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula#getFofRole <em>Fof Role</em>}</li>

+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula#getTffRole <em>Tff Role</em>}</li>

  *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula#getFofFormula <em>Fof Formula</em>}</li>

  *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula#getAnnotations <em>Annotations</em>}</li>

  * </ul>

@@ -53,30 +53,30 @@ public interface VLSTffFormula extends EObject
   void setName(String value);

 

   /**

-   * Returns the value of the '<em><b>Fof Role</b></em>' attribute.

+   * Returns the value of the '<em><b>Tff Role</b></em>' attribute.

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

    * <p>

-   * If the meaning of the '<em>Fof Role</em>' attribute isn't clear,

+   * If the meaning of the '<em>Tff Role</em>' attribute isn't clear,

    * there really should be more of a description here...

    * </p>

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

-   * @return the value of the '<em>Fof Role</em>' attribute.

-   * @see #setFofRole(String)

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTffFormula_FofRole()

+   * @return the value of the '<em>Tff Role</em>' attribute.

+   * @see #setTffRole(String)

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTffFormula_TffRole()

    * @model

    * @generated

    */

-  String getFofRole();

+  String getTffRole();

 

   /**

-   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula#getFofRole <em>Fof Role</em>}' attribute.

+   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula#getTffRole <em>Tff Role</em>}' attribute.

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

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

-   * @param value the new value of the '<em>Fof Role</em>' attribute.

-   * @see #getFofRole()

+   * @param value the new value of the '<em>Tff Role</em>' attribute.

+   * @see #getTffRole()

    * @generated

    */

-  void setFofRole(String value);

+  void setTffRole(String value);

 

   /**

    * Returns the value of the '<em><b>Fof Formula</b></em>' containment reference.

@@ -87,12 +87,12 @@ public interface VLSTffFormula extends EObject
    * </p>

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

    * @return the value of the '<em>Fof Formula</em>' containment reference.

-   * @see #setFofFormula(VLSTerm)

+   * @see #setFofFormula(VLSTffTerm)

    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTffFormula_FofFormula()

    * @model containment="true"

    * @generated

    */

-  VLSTerm getFofFormula();

+  VLSTffTerm getFofFormula();

 

   /**

    * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula#getFofFormula <em>Fof Formula</em>}' containment reference.

@@ -102,7 +102,7 @@ public interface VLSTffFormula extends EObject
    * @see #getFofFormula()

    * @generated

    */

-  void setFofFormula(VLSTerm value);

+  void setFofFormula(VLSTffTerm value);

 

   /**

    * Returns the value of the '<em><b>Annotations</b></em>' containment reference.

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRational.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTffTerm.java
index 017f231c..05de6deb 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSRational.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTffTerm.java
@@ -1,19 +1,20 @@
-/**

- * generated by Xtext 2.14.0

- */

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

-

-

-/**

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

- * A representation of the model object '<em><b>VLS Rational</b></em>'.

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

- *

- *

- * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSRational()

- * @model

- * @generated

- */

-public interface VLSRational extends VLSDefinedTerm

-{

-} // VLSRational

+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>VLS Tff Term</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTffTerm()
+ * @model
+ * @generated
+ */
+public interface VLSTffTerm extends EObject
+{
+} // VLSTffTerm
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSName.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTrying.java
index 32981a8b..4b9cd408 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSName.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTrying.java
@@ -1,52 +1,51 @@
-/**

- * generated by Xtext 2.14.0

- */

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

-

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

-

-/**

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

- * A representation of the model object '<em><b>VLS Name</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

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

- * </ul>

- *

- * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSName()

- * @model

- * @generated

- */

-public interface VLSName extends EObject

-{

-  /**

-   * Returns the value of the '<em><b>Name</b></em>' attribute.

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

-   * <p>

-   * If the meaning of the '<em>Name</em>' attribute isn't clear,

-   * there really should be more of a description here...

-   * </p>

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

-   * @return the value of the '<em>Name</em>' attribute.

-   * @see #setName(String)

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSName_Name()

-   * @model

-   * @generated

-   */

-  String getName();

-

-  /**

-   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSName#getName <em>Name</em>}' attribute.

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

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

-   * @param value the new value of the '<em>Name</em>' attribute.

-   * @see #getName()

-   * @generated

-   */

-  void setName(String value);

-

-} // VLSName

+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>VLS Trying</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTrying()
+ * @model
+ * @generated
+ */
+public interface VLSTrying extends VLSConfirmations
+{
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTrying_Name()
+   * @model
+   * @generated
+   */
+  String getName();
+
+  /**
+   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
+
+} // VLSTrying
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTypeDef.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTypeDef.java
new file mode 100644
index 00000000..21cd9e0f
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTypeDef.java
@@ -0,0 +1,133 @@
+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>VLS Type Def</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getTypeSig <em>Type Sig</em>}</li>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getMapsTo <em>Maps To</em>}</li>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getInitType <em>Init Type</em>}</li>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getNextType <em>Next Type</em>}</li>
+ * </ul>
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTypeDef()
+ * @model
+ * @generated
+ */
+public interface VLSTypeDef extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Type Sig</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Type Sig</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Type Sig</em>' containment reference.
+   * @see #setTypeSig(VLSTypeDef)
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTypeDef_TypeSig()
+   * @model containment="true"
+   * @generated
+   */
+  VLSTypeDef getTypeSig();
+
+  /**
+   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getTypeSig <em>Type Sig</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Type Sig</em>' containment reference.
+   * @see #getTypeSig()
+   * @generated
+   */
+  void setTypeSig(VLSTypeDef value);
+
+  /**
+   * Returns the value of the '<em><b>Maps To</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Maps To</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Maps To</em>' containment reference.
+   * @see #setMapsTo(VLSTerm)
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTypeDef_MapsTo()
+   * @model containment="true"
+   * @generated
+   */
+  VLSTerm getMapsTo();
+
+  /**
+   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getMapsTo <em>Maps To</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Maps To</em>' containment reference.
+   * @see #getMapsTo()
+   * @generated
+   */
+  void setMapsTo(VLSTerm value);
+
+  /**
+   * Returns the value of the '<em><b>Init Type</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Init Type</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Init Type</em>' containment reference.
+   * @see #setInitType(VLSTerm)
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTypeDef_InitType()
+   * @model containment="true"
+   * @generated
+   */
+  VLSTerm getInitType();
+
+  /**
+   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getInitType <em>Init Type</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Init Type</em>' containment reference.
+   * @see #getInitType()
+   * @generated
+   */
+  void setInitType(VLSTerm value);
+
+  /**
+   * Returns the value of the '<em><b>Next Type</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Next Type</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Next Type</em>' containment reference.
+   * @see #setNextType(VLSTerm)
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTypeDef_NextType()
+   * @model containment="true"
+   * @generated
+   */
+  VLSTerm getNextType();
+
+  /**
+   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getNextType <em>Next Type</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Next Type</em>' containment reference.
+   * @see #getNextType()
+   * @generated
+   */
+  void setNextType(VLSTerm value);
+
+} // VLSTypeDef
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java
index 28ae1a33..00dd1733 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java
@@ -26,7 +26,7 @@ public interface VLSUniversalQuantifier extends VLSTerm
 {

   /**

    * Returns the value of the '<em><b>Variables</b></em>' containment reference list.

-   * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable}.

+   * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration}.

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

    * <p>

    * If the meaning of the '<em>Variables</em>' containment reference list isn't clear,

@@ -38,7 +38,7 @@ public interface VLSUniversalQuantifier extends VLSTerm
    * @model containment="true"

    * @generated

    */

-  EList<VLSVariable> getVariables();

+  EList<VLSVariableDeclaration> getVariables();

 

   /**

    * Returns the value of the '<em><b>Operand</b></em>' containment reference.

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java
index 9750e4c5..5a9dc028 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java
@@ -20,7 +20,7 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage;
  * @model

  * @generated

  */

-public interface VLSVariable extends VLSTerm

+public interface VLSVariable extends VLSVariableDeclaration, VLSTerm

 {

   /**

    * Returns the value of the '<em><b>Name</b></em>' attribute.

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariableDeclaration.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariableDeclaration.java
new file mode 100644
index 00000000..9e5a6ba2
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariableDeclaration.java
@@ -0,0 +1,19 @@
+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>VLS Variable Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSVariableDeclaration()
+ * @model
+ * @generated
+ */
+public interface VLSVariableDeclaration extends VLSDeclaration
+{
+} // VLSVariableDeclaration
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSReal.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSWarning.java
index 3933fe6e..7b2f8535 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSReal.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSWarning.java
@@ -1,19 +1,19 @@
-/**

- * generated by Xtext 2.14.0

- */

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

-

-

-/**

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

- * A representation of the model object '<em><b>VLS Real</b></em>'.

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

- *

- *

- * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSReal()

- * @model

- * @generated

- */

-public interface VLSReal extends VLSDefinedTerm

-{

-} // VLSReal

+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>VLS Warning</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSWarning()
+ * @model
+ * @generated
+ */
+public interface VLSWarning extends VLSConfirmations
+{
+} // VLSWarning
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguageFactory.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguageFactory.java
index 0fb23c87..171bb39e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguageFactory.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguageFactory.java
@@ -33,76 +33,94 @@ public interface VampireLanguageFactory extends EFactory
   VampireModel createVampireModel();

 

   /**

-   * Returns a new object of class '<em>VLS Include</em>'.

+   * Returns a new object of class '<em>VLS Comment</em>'.

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

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

-   * @return a new object of class '<em>VLS Include</em>'.

+   * @return a new object of class '<em>VLS Comment</em>'.

    * @generated

    */

-  VLSInclude createVLSInclude();

+  VLSComment createVLSComment();

 

   /**

-   * Returns a new object of class '<em>VLS Name</em>'.

+   * Returns a new object of class '<em>VLS Confirmations</em>'.

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

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

-   * @return a new object of class '<em>VLS Name</em>'.

+   * @return a new object of class '<em>VLS Confirmations</em>'.

    * @generated

    */

-  VLSName createVLSName();

+  VLSConfirmations createVLSConfirmations();

 

   /**

-   * Returns a new object of class '<em>VLS Comment</em>'.

+   * Returns a new object of class '<em>VLS Fof Formula</em>'.

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

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

-   * @return a new object of class '<em>VLS Comment</em>'.

+   * @return a new object of class '<em>VLS Fof Formula</em>'.

    * @generated

    */

-  VLSComment createVLSComment();

+  VLSFofFormula createVLSFofFormula();

 

   /**

-   * Returns a new object of class '<em>VLS Confirmations</em>'.

+   * Returns a new object of class '<em>VLS Tff Formula</em>'.

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

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

-   * @return a new object of class '<em>VLS Confirmations</em>'.

+   * @return a new object of class '<em>VLS Tff Formula</em>'.

    * @generated

    */

-  VLSConfirmations createVLSConfirmations();

+  VLSTffFormula createVLSTffFormula();

 

   /**

-   * Returns a new object of class '<em>VLS Satisfiable</em>'.

+   * Returns a new object of class '<em>VLS Annotation</em>'.

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

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

-   * @return a new object of class '<em>VLS Satisfiable</em>'.

+   * @return a new object of class '<em>VLS Annotation</em>'.

    * @generated

    */

-  VLSSatisfiable createVLSSatisfiable();

+  VLSAnnotation createVLSAnnotation();

 

   /**

-   * Returns a new object of class '<em>VLS Fof Formula</em>'.

+   * Returns a new object of class '<em>VLS Tff Term</em>'.

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

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

-   * @return a new object of class '<em>VLS Fof Formula</em>'.

+   * @return a new object of class '<em>VLS Tff Term</em>'.

    * @generated

    */

-  VLSFofFormula createVLSFofFormula();

+  VLSTffTerm createVLSTffTerm();

 

   /**

-   * Returns a new object of class '<em>VLS Tff Formula</em>'.

+   * Returns a new object of class '<em>VLS Declaration</em>'.

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

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

-   * @return a new object of class '<em>VLS Tff Formula</em>'.

+   * @return a new object of class '<em>VLS Declaration</em>'.

    * @generated

    */

-  VLSTffFormula createVLSTffFormula();

+  VLSDeclaration createVLSDeclaration();

 

   /**

-   * Returns a new object of class '<em>VLS Annotation</em>'.

+   * Returns a new object of class '<em>VLS Other Declaration</em>'.

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

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

-   * @return a new object of class '<em>VLS Annotation</em>'.

+   * @return a new object of class '<em>VLS Other Declaration</em>'.

    * @generated

    */

-  VLSAnnotation createVLSAnnotation();

+  VLSOtherDeclaration createVLSOtherDeclaration();

+

+  /**

+   * Returns a new object of class '<em>VLS Variable Declaration</em>'.

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

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

+   * @return a new object of class '<em>VLS Variable Declaration</em>'.

+   * @generated

+   */

+  VLSVariableDeclaration createVLSVariableDeclaration();

+

+  /**

+   * Returns a new object of class '<em>VLS Type Def</em>'.

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

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

+   * @return a new object of class '<em>VLS Type Def</em>'.

+   * @generated

+   */

+  VLSTypeDef createVLSTypeDef();

 

   /**

    * Returns a new object of class '<em>VLS Term</em>'.

@@ -141,6 +159,42 @@ public interface VampireLanguageFactory extends EFactory
   VLSDefinedTerm createVLSDefinedTerm();

 

   /**

+   * Returns a new object of class '<em>VLS Satisfiable</em>'.

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

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

+   * @return a new object of class '<em>VLS Satisfiable</em>'.

+   * @generated

+   */

+  VLSSatisfiable createVLSSatisfiable();

+

+  /**

+   * Returns a new object of class '<em>VLS Warning</em>'.

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

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

+   * @return a new object of class '<em>VLS Warning</em>'.

+   * @generated

+   */

+  VLSWarning createVLSWarning();

+

+  /**

+   * Returns a new object of class '<em>VLS Trying</em>'.

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

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

+   * @return a new object of class '<em>VLS Trying</em>'.

+   * @generated

+   */

+  VLSTrying createVLSTrying();

+

+  /**

+   * Returns a new object of class '<em>VLS Finite Model</em>'.

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

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

+   * @return a new object of class '<em>VLS Finite Model</em>'.

+   * @generated

+   */

+  VLSFiniteModel createVLSFiniteModel();

+

+  /**

    * Returns a new object of class '<em>VLS Equivalent</em>'.

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

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

@@ -321,24 +375,6 @@ public interface VampireLanguageFactory extends EFactory
   VLSInt createVLSInt();

 

   /**

-   * Returns a new object of class '<em>VLS Real</em>'.

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

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

-   * @return a new object of class '<em>VLS Real</em>'.

-   * @generated

-   */

-  VLSReal createVLSReal();

-

-  /**

-   * Returns a new object of class '<em>VLS Rational</em>'.

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

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

-   * @return a new object of class '<em>VLS Rational</em>'.

-   * @generated

-   */

-  VLSRational createVLSRational();

-

-  /**

    * Returns a new object of class '<em>VLS Double Quote</em>'.

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

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

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java
index 60061aee..3ef777f8 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java
@@ -68,22 +68,13 @@ public interface VampireLanguagePackage extends EPackage
   int VAMPIRE_MODEL = 0;

 

   /**

-   * The feature id for the '<em><b>Includes</b></em>' containment reference list.

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

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

-   * @generated

-   * @ordered

-   */

-  int VAMPIRE_MODEL__INCLUDES = 0;

-

-  /**

    * The feature id for the '<em><b>Comments</b></em>' containment reference list.

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

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

    * @generated

    * @ordered

    */

-  int VAMPIRE_MODEL__COMMENTS = 1;

+  int VAMPIRE_MODEL__COMMENTS = 0;

 

   /**

    * The feature id for the '<em><b>Confirmations</b></em>' containment reference list.

@@ -92,7 +83,7 @@ public interface VampireLanguagePackage extends EPackage
    * @generated

    * @ordered

    */

-  int VAMPIRE_MODEL__CONFIRMATIONS = 2;

+  int VAMPIRE_MODEL__CONFIRMATIONS = 1;

 

   /**

    * The feature id for the '<em><b>Formulas</b></em>' containment reference list.

@@ -101,7 +92,7 @@ public interface VampireLanguagePackage extends EPackage
    * @generated

    * @ordered

    */

-  int VAMPIRE_MODEL__FORMULAS = 3;

+  int VAMPIRE_MODEL__FORMULAS = 2;

 

   /**

    * The feature id for the '<em><b>Tfformulas</b></em>' containment reference list.

@@ -110,7 +101,7 @@ public interface VampireLanguagePackage extends EPackage
    * @generated

    * @ordered

    */

-  int VAMPIRE_MODEL__TFFORMULAS = 4;

+  int VAMPIRE_MODEL__TFFORMULAS = 3;

 

   /**

    * The number of structural features of the '<em>Vampire Model</em>' class.

@@ -119,54 +110,64 @@ public interface VampireLanguagePackage extends EPackage
    * @generated

    * @ordered

    */

-  int VAMPIRE_MODEL_FEATURE_COUNT = 5;

+  int VAMPIRE_MODEL_FEATURE_COUNT = 4;

 

   /**

-   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSIncludeImpl <em>VLS Include</em>}' class.

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSCommentImpl <em>VLS Comment</em>}' class.

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

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

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSIncludeImpl

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSInclude()

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSCommentImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSComment()

    * @generated

    */

-  int VLS_INCLUDE = 1;

+  int VLS_COMMENT = 1;

 

   /**

-   * The feature id for the '<em><b>File Name</b></em>' attribute.

+   * The feature id for the '<em><b>Comment</b></em>' attribute.

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

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

    * @generated

    * @ordered

    */

-  int VLS_INCLUDE__FILE_NAME = 0;

+  int VLS_COMMENT__COMMENT = 0;

 

   /**

-   * The feature id for the '<em><b>Names</b></em>' containment reference list.

+   * The number of structural features of the '<em>VLS Comment</em>' class.

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

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

    * @generated

    * @ordered

    */

-  int VLS_INCLUDE__NAMES = 1;

+  int VLS_COMMENT_FEATURE_COUNT = 1;

 

   /**

-   * The number of structural features of the '<em>VLS Include</em>' class.

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSConfirmationsImpl <em>VLS Confirmations</em>}' class.

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

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

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSConfirmationsImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSConfirmations()

+   * @generated

+   */

+  int VLS_CONFIRMATIONS = 2;

+

+  /**

+   * The number of structural features of the '<em>VLS Confirmations</em>' class.

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

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

    * @generated

    * @ordered

    */

-  int VLS_INCLUDE_FEATURE_COUNT = 2;

+  int VLS_CONFIRMATIONS_FEATURE_COUNT = 0;

 

   /**

-   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSNameImpl <em>VLS Name</em>}' class.

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFofFormulaImpl <em>VLS Fof Formula</em>}' class.

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

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

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSNameImpl

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSName()

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFofFormulaImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFofFormula()

    * @generated

    */

-  int VLS_NAME = 2;

+  int VLS_FOF_FORMULA = 3;

 

   /**

    * The feature id for the '<em><b>Name</b></em>' attribute.

@@ -175,238 +176,275 @@ public interface VampireLanguagePackage extends EPackage
    * @generated

    * @ordered

    */

-  int VLS_NAME__NAME = 0;

+  int VLS_FOF_FORMULA__NAME = 0;

 

   /**

-   * The number of structural features of the '<em>VLS Name</em>' class.

+   * The feature id for the '<em><b>Fof Role</b></em>' attribute.

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

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

    * @generated

    * @ordered

    */

-  int VLS_NAME_FEATURE_COUNT = 1;

+  int VLS_FOF_FORMULA__FOF_ROLE = 1;

 

   /**

-   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSCommentImpl <em>VLS Comment</em>}' class.

+   * The feature id for the '<em><b>Fof Formula</b></em>' containment reference.

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

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

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSCommentImpl

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSComment()

    * @generated

+   * @ordered

    */

-  int VLS_COMMENT = 3;

+  int VLS_FOF_FORMULA__FOF_FORMULA = 2;

 

   /**

-   * The feature id for the '<em><b>Comment</b></em>' attribute.

+   * The feature id for the '<em><b>Annotations</b></em>' containment reference.

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

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

    * @generated

    * @ordered

    */

-  int VLS_COMMENT__COMMENT = 0;

+  int VLS_FOF_FORMULA__ANNOTATIONS = 3;

 

   /**

-   * The number of structural features of the '<em>VLS Comment</em>' class.

+   * The number of structural features of the '<em>VLS Fof Formula</em>' class.

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

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

    * @generated

    * @ordered

    */

-  int VLS_COMMENT_FEATURE_COUNT = 1;

+  int VLS_FOF_FORMULA_FEATURE_COUNT = 4;

 

   /**

-   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSConfirmationsImpl <em>VLS Confirmations</em>}' class.

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTffFormulaImpl <em>VLS Tff Formula</em>}' class.

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

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

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSConfirmationsImpl

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSConfirmations()

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTffFormulaImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTffFormula()

    * @generated

    */

-  int VLS_CONFIRMATIONS = 4;

+  int VLS_TFF_FORMULA = 4;

 

   /**

-   * The number of structural features of the '<em>VLS Confirmations</em>' class.

+   * The feature id for the '<em><b>Name</b></em>' attribute.

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

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

    * @generated

    * @ordered

    */

-  int VLS_CONFIRMATIONS_FEATURE_COUNT = 0;

+  int VLS_TFF_FORMULA__NAME = 0;

 

   /**

-   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSSatisfiableImpl <em>VLS Satisfiable</em>}' class.

+   * The feature id for the '<em><b>Tff Role</b></em>' attribute.

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

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

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSSatisfiableImpl

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSSatisfiable()

    * @generated

+   * @ordered

    */

-  int VLS_SATISFIABLE = 5;

+  int VLS_TFF_FORMULA__TFF_ROLE = 1;

 

   /**

-   * The number of structural features of the '<em>VLS Satisfiable</em>' class.

+   * The feature id for the '<em><b>Fof Formula</b></em>' containment reference.

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

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

    * @generated

    * @ordered

    */

-  int VLS_SATISFIABLE_FEATURE_COUNT = VLS_CONFIRMATIONS_FEATURE_COUNT + 0;

+  int VLS_TFF_FORMULA__FOF_FORMULA = 2;

 

   /**

-   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFofFormulaImpl <em>VLS Fof Formula</em>}' class.

+   * The feature id for the '<em><b>Annotations</b></em>' containment reference.

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

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

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFofFormulaImpl

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFofFormula()

    * @generated

+   * @ordered

    */

-  int VLS_FOF_FORMULA = 6;

+  int VLS_TFF_FORMULA__ANNOTATIONS = 3;

 

   /**

-   * The feature id for the '<em><b>Name</b></em>' attribute.

+   * The number of structural features of the '<em>VLS Tff Formula</em>' class.

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

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

    * @generated

    * @ordered

    */

-  int VLS_FOF_FORMULA__NAME = 0;

+  int VLS_TFF_FORMULA_FEATURE_COUNT = 4;

 

   /**

-   * The feature id for the '<em><b>Fof Role</b></em>' attribute.

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSAnnotationImpl <em>VLS Annotation</em>}' class.

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

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

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSAnnotationImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSAnnotation()

+   * @generated

+   */

+  int VLS_ANNOTATION = 5;

+

+  /**

+   * The feature id for the '<em><b>Name</b></em>' attribute.

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

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

    * @generated

    * @ordered

    */

-  int VLS_FOF_FORMULA__FOF_ROLE = 1;

+  int VLS_ANNOTATION__NAME = 0;

 

   /**

-   * The feature id for the '<em><b>Fof Formula</b></em>' containment reference.

+   * The feature id for the '<em><b>Followup</b></em>' containment reference.

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

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

    * @generated

    * @ordered

    */

-  int VLS_FOF_FORMULA__FOF_FORMULA = 2;

+  int VLS_ANNOTATION__FOLLOWUP = 1;

 

   /**

-   * The feature id for the '<em><b>Annotations</b></em>' containment reference.

+   * The feature id for the '<em><b>Terms</b></em>' containment reference list.

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

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

    * @generated

    * @ordered

    */

-  int VLS_FOF_FORMULA__ANNOTATIONS = 3;

+  int VLS_ANNOTATION__TERMS = 2;

 

   /**

-   * The number of structural features of the '<em>VLS Fof Formula</em>' class.

+   * The number of structural features of the '<em>VLS Annotation</em>' class.

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

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

    * @generated

    * @ordered

    */

-  int VLS_FOF_FORMULA_FEATURE_COUNT = 4;

+  int VLS_ANNOTATION_FEATURE_COUNT = 3;

 

   /**

-   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTffFormulaImpl <em>VLS Tff Formula</em>}' class.

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTffTermImpl <em>VLS Tff Term</em>}' class.

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

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

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTffFormulaImpl

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTffFormula()

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTffTermImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTffTerm()

    * @generated

    */

-  int VLS_TFF_FORMULA = 7;

+  int VLS_TFF_TERM = 6;

 

   /**

-   * The feature id for the '<em><b>Name</b></em>' attribute.

+   * The number of structural features of the '<em>VLS Tff Term</em>' class.

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

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

    * @generated

    * @ordered

    */

-  int VLS_TFF_FORMULA__NAME = 0;

+  int VLS_TFF_TERM_FEATURE_COUNT = 0;

 

   /**

-   * The feature id for the '<em><b>Fof Role</b></em>' attribute.

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDeclarationImpl <em>VLS Declaration</em>}' class.

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

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

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDeclarationImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSDeclaration()

    * @generated

-   * @ordered

    */

-  int VLS_TFF_FORMULA__FOF_ROLE = 1;

+  int VLS_DECLARATION = 7;

 

   /**

-   * The feature id for the '<em><b>Fof Formula</b></em>' containment reference.

+   * The number of structural features of the '<em>VLS Declaration</em>' class.

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

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

    * @generated

    * @ordered

    */

-  int VLS_TFF_FORMULA__FOF_FORMULA = 2;

+  int VLS_DECLARATION_FEATURE_COUNT = VLS_TFF_TERM_FEATURE_COUNT + 0;

 

   /**

-   * The feature id for the '<em><b>Annotations</b></em>' containment reference.

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSOtherDeclarationImpl <em>VLS Other Declaration</em>}' class.

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

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

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSOtherDeclarationImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSOtherDeclaration()

+   * @generated

+   */

+  int VLS_OTHER_DECLARATION = 8;

+

+  /**

+   * The number of structural features of the '<em>VLS Other Declaration</em>' class.

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

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

    * @generated

    * @ordered

    */

-  int VLS_TFF_FORMULA__ANNOTATIONS = 3;

+  int VLS_OTHER_DECLARATION_FEATURE_COUNT = VLS_DECLARATION_FEATURE_COUNT + 0;

 

   /**

-   * The number of structural features of the '<em>VLS Tff Formula</em>' class.

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableDeclarationImpl <em>VLS Variable Declaration</em>}' class.

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

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

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableDeclarationImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSVariableDeclaration()

+   * @generated

+   */

+  int VLS_VARIABLE_DECLARATION = 9;

+

+  /**

+   * The number of structural features of the '<em>VLS Variable Declaration</em>' class.

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

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

    * @generated

    * @ordered

    */

-  int VLS_TFF_FORMULA_FEATURE_COUNT = 4;

+  int VLS_VARIABLE_DECLARATION_FEATURE_COUNT = VLS_DECLARATION_FEATURE_COUNT + 0;

 

   /**

-   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSAnnotationImpl <em>VLS Annotation</em>}' class.

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTypeDefImpl <em>VLS Type Def</em>}' class.

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

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

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSAnnotationImpl

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSAnnotation()

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTypeDefImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTypeDef()

    * @generated

    */

-  int VLS_ANNOTATION = 8;

+  int VLS_TYPE_DEF = 10;

 

   /**

-   * The feature id for the '<em><b>Name</b></em>' attribute.

+   * The feature id for the '<em><b>Type Sig</b></em>' containment reference.

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

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

    * @generated

    * @ordered

    */

-  int VLS_ANNOTATION__NAME = 0;

+  int VLS_TYPE_DEF__TYPE_SIG = 0;

 

   /**

-   * The feature id for the '<em><b>Followup</b></em>' containment reference.

+   * The feature id for the '<em><b>Maps To</b></em>' containment reference.

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

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

    * @generated

    * @ordered

    */

-  int VLS_ANNOTATION__FOLLOWUP = 1;

+  int VLS_TYPE_DEF__MAPS_TO = 1;

 

   /**

-   * The feature id for the '<em><b>Terms</b></em>' containment reference list.

+   * The feature id for the '<em><b>Init Type</b></em>' containment reference.

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

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

    * @generated

    * @ordered

    */

-  int VLS_ANNOTATION__TERMS = 2;

+  int VLS_TYPE_DEF__INIT_TYPE = 2;

 

   /**

-   * The number of structural features of the '<em>VLS Annotation</em>' class.

+   * The feature id for the '<em><b>Next Type</b></em>' containment reference.

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

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

    * @generated

    * @ordered

    */

-  int VLS_ANNOTATION_FEATURE_COUNT = 3;

+  int VLS_TYPE_DEF__NEXT_TYPE = 3;

+

+  /**

+   * The number of structural features of the '<em>VLS Type Def</em>' class.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_TYPE_DEF_FEATURE_COUNT = 4;

 

   /**

    * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTermImpl <em>VLS Term</em>}' class.

@@ -416,7 +454,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTerm()

    * @generated

    */

-  int VLS_TERM = 9;

+  int VLS_TERM = 11;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_TERM__TYPE = VLS_TFF_TERM_FEATURE_COUNT + 0;

 

   /**

    * The number of structural features of the '<em>VLS Term</em>' class.

@@ -425,7 +472,7 @@ public interface VampireLanguagePackage extends EPackage
    * @generated

    * @ordered

    */

-  int VLS_TERM_FEATURE_COUNT = 0;

+  int VLS_TERM_FEATURE_COUNT = VLS_TFF_TERM_FEATURE_COUNT + 1;

 

   /**

    * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableImpl <em>VLS Variable</em>}' class.

@@ -435,7 +482,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSVariable()

    * @generated

    */

-  int VLS_VARIABLE = 10;

+  int VLS_VARIABLE = 12;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_VARIABLE__TYPE = VLS_VARIABLE_DECLARATION_FEATURE_COUNT + 0;

 

   /**

    * The feature id for the '<em><b>Name</b></em>' attribute.

@@ -444,7 +500,7 @@ public interface VampireLanguagePackage extends EPackage
    * @generated

    * @ordered

    */

-  int VLS_VARIABLE__NAME = VLS_TERM_FEATURE_COUNT + 0;

+  int VLS_VARIABLE__NAME = VLS_VARIABLE_DECLARATION_FEATURE_COUNT + 1;

 

   /**

    * The number of structural features of the '<em>VLS Variable</em>' class.

@@ -453,7 +509,7 @@ public interface VampireLanguagePackage extends EPackage
    * @generated

    * @ordered

    */

-  int VLS_VARIABLE_FEATURE_COUNT = VLS_TERM_FEATURE_COUNT + 1;

+  int VLS_VARIABLE_FEATURE_COUNT = VLS_VARIABLE_DECLARATION_FEATURE_COUNT + 2;

 

   /**

    * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl <em>VLS Function As Term</em>}' class.

@@ -463,7 +519,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFunctionAsTerm()

    * @generated

    */

-  int VLS_FUNCTION_AS_TERM = 11;

+  int VLS_FUNCTION_AS_TERM = 13;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_FUNCTION_AS_TERM__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Functor</b></em>' attribute.

@@ -500,7 +565,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSDefinedTerm()

    * @generated

    */

-  int VLS_DEFINED_TERM = 12;

+  int VLS_DEFINED_TERM = 14;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_DEFINED_TERM__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Value</b></em>' attribute.

@@ -521,6 +595,91 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_DEFINED_TERM_FEATURE_COUNT = VLS_TERM_FEATURE_COUNT + 1;

 

   /**

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSSatisfiableImpl <em>VLS Satisfiable</em>}' class.

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

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

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSSatisfiableImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSSatisfiable()

+   * @generated

+   */

+  int VLS_SATISFIABLE = 15;

+

+  /**

+   * The number of structural features of the '<em>VLS Satisfiable</em>' class.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_SATISFIABLE_FEATURE_COUNT = VLS_CONFIRMATIONS_FEATURE_COUNT + 0;

+

+  /**

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSWarningImpl <em>VLS Warning</em>}' class.

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

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

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSWarningImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSWarning()

+   * @generated

+   */

+  int VLS_WARNING = 16;

+

+  /**

+   * The number of structural features of the '<em>VLS Warning</em>' class.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_WARNING_FEATURE_COUNT = VLS_CONFIRMATIONS_FEATURE_COUNT + 0;

+

+  /**

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTryingImpl <em>VLS Trying</em>}' class.

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

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

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTryingImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTrying()

+   * @generated

+   */

+  int VLS_TRYING = 17;

+

+  /**

+   * The feature id for the '<em><b>Name</b></em>' attribute.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_TRYING__NAME = VLS_CONFIRMATIONS_FEATURE_COUNT + 0;

+

+  /**

+   * The number of structural features of the '<em>VLS Trying</em>' class.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_TRYING_FEATURE_COUNT = VLS_CONFIRMATIONS_FEATURE_COUNT + 1;

+

+  /**

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFiniteModelImpl <em>VLS Finite Model</em>}' class.

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

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

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFiniteModelImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFiniteModel()

+   * @generated

+   */

+  int VLS_FINITE_MODEL = 18;

+

+  /**

+   * The number of structural features of the '<em>VLS Finite Model</em>' class.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_FINITE_MODEL_FEATURE_COUNT = VLS_CONFIRMATIONS_FEATURE_COUNT + 0;

+

+  /**

    * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSEquivalentImpl <em>VLS Equivalent</em>}' class.

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

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

@@ -528,7 +687,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSEquivalent()

    * @generated

    */

-  int VLS_EQUIVALENT = 13;

+  int VLS_EQUIVALENT = 19;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_EQUIVALENT__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

@@ -565,7 +733,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSImplies()

    * @generated

    */

-  int VLS_IMPLIES = 14;

+  int VLS_IMPLIES = 20;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_IMPLIES__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

@@ -602,7 +779,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSRevImplies()

    * @generated

    */

-  int VLS_REV_IMPLIES = 15;

+  int VLS_REV_IMPLIES = 21;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_REV_IMPLIES__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

@@ -639,7 +825,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSXnor()

    * @generated

    */

-  int VLS_XNOR = 16;

+  int VLS_XNOR = 22;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_XNOR__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

@@ -676,7 +871,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSNor()

    * @generated

    */

-  int VLS_NOR = 17;

+  int VLS_NOR = 23;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_NOR__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

@@ -713,7 +917,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSNand()

    * @generated

    */

-  int VLS_NAND = 18;

+  int VLS_NAND = 24;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_NAND__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

@@ -750,7 +963,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSAnd()

    * @generated

    */

-  int VLS_AND = 19;

+  int VLS_AND = 25;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_AND__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

@@ -787,7 +1009,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSOr()

    * @generated

    */

-  int VLS_OR = 20;

+  int VLS_OR = 26;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_OR__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

@@ -824,7 +1055,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSUniversalQuantifier()

    * @generated

    */

-  int VLS_UNIVERSAL_QUANTIFIER = 21;

+  int VLS_UNIVERSAL_QUANTIFIER = 27;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_UNIVERSAL_QUANTIFIER__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Variables</b></em>' containment reference list.

@@ -861,7 +1101,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSExistentialQuantifier()

    * @generated

    */

-  int VLS_EXISTENTIAL_QUANTIFIER = 22;

+  int VLS_EXISTENTIAL_QUANTIFIER = 28;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_EXISTENTIAL_QUANTIFIER__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Variables</b></em>' containment reference list.

@@ -898,7 +1147,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSUnaryNegation()

    * @generated

    */

-  int VLS_UNARY_NEGATION = 23;

+  int VLS_UNARY_NEGATION = 29;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_UNARY_NEGATION__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Operand</b></em>' containment reference.

@@ -926,7 +1184,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSInequality()

    * @generated

    */

-  int VLS_INEQUALITY = 24;

+  int VLS_INEQUALITY = 30;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_INEQUALITY__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

@@ -963,7 +1230,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSEquality()

    * @generated

    */

-  int VLS_EQUALITY = 25;

+  int VLS_EQUALITY = 31;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_EQUALITY__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

@@ -1000,7 +1276,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSAssignment()

    * @generated

    */

-  int VLS_ASSIGNMENT = 26;

+  int VLS_ASSIGNMENT = 32;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_ASSIGNMENT__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

@@ -1037,7 +1322,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSConstant()

    * @generated

    */

-  int VLS_CONSTANT = 27;

+  int VLS_CONSTANT = 33;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_CONSTANT__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Name</b></em>' attribute.

@@ -1065,7 +1359,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTrue()

    * @generated

    */

-  int VLS_TRUE = 28;

+  int VLS_TRUE = 34;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_TRUE__TYPE = VLS_TERM__TYPE;

 

   /**

    * The number of structural features of the '<em>VLS True</em>' class.

@@ -1084,7 +1387,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFalse()

    * @generated

    */

-  int VLS_FALSE = 29;

+  int VLS_FALSE = 35;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_FALSE__TYPE = VLS_TERM__TYPE;

 

   /**

    * The number of structural features of the '<em>VLS False</em>' class.

@@ -1103,7 +1415,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFunction()

    * @generated

    */

-  int VLS_FUNCTION = 30;

+  int VLS_FUNCTION = 36;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_FUNCTION__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Constant</b></em>' attribute.

@@ -1140,7 +1461,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSLess()

    * @generated

    */

-  int VLS_LESS = 31;

+  int VLS_LESS = 37;

+

+  /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_LESS__TYPE = VLS_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Name</b></em>' attribute.

@@ -1177,35 +1507,16 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSInt()

    * @generated

    */

-  int VLS_INT = 32;

+  int VLS_INT = 38;

 

   /**

-   * The feature id for the '<em><b>Value</b></em>' attribute.

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

    * @generated

    * @ordered

    */

-  int VLS_INT__VALUE = VLS_DEFINED_TERM__VALUE;

-

-  /**

-   * The number of structural features of the '<em>VLS Int</em>' class.

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

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

-   * @generated

-   * @ordered

-   */

-  int VLS_INT_FEATURE_COUNT = VLS_DEFINED_TERM_FEATURE_COUNT + 0;

-

-  /**

-   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSRealImpl <em>VLS Real</em>}' class.

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

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

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSRealImpl

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSReal()

-   * @generated

-   */

-  int VLS_REAL = 33;

+  int VLS_INT__TYPE = VLS_DEFINED_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Value</b></em>' attribute.

@@ -1214,54 +1525,35 @@ public interface VampireLanguagePackage extends EPackage
    * @generated

    * @ordered

    */

-  int VLS_REAL__VALUE = VLS_DEFINED_TERM__VALUE;

+  int VLS_INT__VALUE = VLS_DEFINED_TERM__VALUE;

 

   /**

-   * The number of structural features of the '<em>VLS Real</em>' class.

+   * The number of structural features of the '<em>VLS Int</em>' class.

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

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

    * @generated

    * @ordered

    */

-  int VLS_REAL_FEATURE_COUNT = VLS_DEFINED_TERM_FEATURE_COUNT + 0;

-

-  /**

-   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSRationalImpl <em>VLS Rational</em>}' class.

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

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

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSRationalImpl

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSRational()

-   * @generated

-   */

-  int VLS_RATIONAL = 34;

+  int VLS_INT_FEATURE_COUNT = VLS_DEFINED_TERM_FEATURE_COUNT + 0;

 

   /**

-   * The feature id for the '<em><b>Value</b></em>' attribute.

+   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDoubleQuoteImpl <em>VLS Double Quote</em>}' class.

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

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

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDoubleQuoteImpl

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSDoubleQuote()

    * @generated

-   * @ordered

    */

-  int VLS_RATIONAL__VALUE = VLS_DEFINED_TERM__VALUE;

+  int VLS_DOUBLE_QUOTE = 39;

 

   /**

-   * The number of structural features of the '<em>VLS Rational</em>' class.

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

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

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

    * @generated

    * @ordered

    */

-  int VLS_RATIONAL_FEATURE_COUNT = VLS_DEFINED_TERM_FEATURE_COUNT + 0;

-

-  /**

-   * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDoubleQuoteImpl <em>VLS Double Quote</em>}' class.

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

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

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDoubleQuoteImpl

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSDoubleQuote()

-   * @generated

-   */

-  int VLS_DOUBLE_QUOTE = 35;

+  int VLS_DOUBLE_QUOTE__TYPE = VLS_DEFINED_TERM__TYPE;

 

   /**

    * The feature id for the '<em><b>Value</b></em>' attribute.

@@ -1293,17 +1585,6 @@ public interface VampireLanguagePackage extends EPackage
   EClass getVampireModel();

 

   /**

-   * Returns the meta object for the containment reference list '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireModel#getIncludes <em>Includes</em>}'.

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

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

-   * @return the meta object for the containment reference list '<em>Includes</em>'.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireModel#getIncludes()

-   * @see #getVampireModel()

-   * @generated

-   */

-  EReference getVampireModel_Includes();

-

-  /**

    * Returns the meta object for the containment reference list '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireModel#getComments <em>Comments</em>}'.

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

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

@@ -1348,59 +1629,6 @@ public interface VampireLanguagePackage extends EPackage
   EReference getVampireModel_Tfformulas();

 

   /**

-   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude <em>VLS Include</em>}'.

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

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

-   * @return the meta object for class '<em>VLS Include</em>'.

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

-   * @generated

-   */

-  EClass getVLSInclude();

-

-  /**

-   * Returns the meta object for the attribute '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude#getFileName <em>File Name</em>}'.

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

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

-   * @return the meta object for the attribute '<em>File Name</em>'.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude#getFileName()

-   * @see #getVLSInclude()

-   * @generated

-   */

-  EAttribute getVLSInclude_FileName();

-

-  /**

-   * Returns the meta object for the containment reference list '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude#getNames <em>Names</em>}'.

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

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

-   * @return the meta object for the containment reference list '<em>Names</em>'.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude#getNames()

-   * @see #getVLSInclude()

-   * @generated

-   */

-  EReference getVLSInclude_Names();

-

-  /**

-   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSName <em>VLS Name</em>}'.

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

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

-   * @return the meta object for class '<em>VLS Name</em>'.

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

-   * @generated

-   */

-  EClass getVLSName();

-

-  /**

-   * Returns the meta object for the attribute '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSName#getName <em>Name</em>}'.

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

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

-   * @return the meta object for the attribute '<em>Name</em>'.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSName#getName()

-   * @see #getVLSName()

-   * @generated

-   */

-  EAttribute getVLSName_Name();

-

-  /**

    * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment <em>VLS Comment</em>}'.

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

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

@@ -1432,16 +1660,6 @@ public interface VampireLanguagePackage extends EPackage
   EClass getVLSConfirmations();

 

   /**

-   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSSatisfiable <em>VLS Satisfiable</em>}'.

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

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

-   * @return the meta object for class '<em>VLS Satisfiable</em>'.

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

-   * @generated

-   */

-  EClass getVLSSatisfiable();

-

-  /**

    * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula <em>VLS Fof Formula</em>}'.

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

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

@@ -1517,15 +1735,15 @@ public interface VampireLanguagePackage extends EPackage
   EAttribute getVLSTffFormula_Name();

 

   /**

-   * Returns the meta object for the attribute '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula#getFofRole <em>Fof Role</em>}'.

+   * Returns the meta object for the attribute '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula#getTffRole <em>Tff Role</em>}'.

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

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

-   * @return the meta object for the attribute '<em>Fof Role</em>'.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula#getFofRole()

+   * @return the meta object for the attribute '<em>Tff Role</em>'.

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula#getTffRole()

    * @see #getVLSTffFormula()

    * @generated

    */

-  EAttribute getVLSTffFormula_FofRole();

+  EAttribute getVLSTffFormula_TffRole();

 

   /**

    * Returns the meta object for the containment reference '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula#getFofFormula <em>Fof Formula</em>}'.

@@ -1593,6 +1811,100 @@ public interface VampireLanguagePackage extends EPackage
   EReference getVLSAnnotation_Terms();

 

   /**

+   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffTerm <em>VLS Tff Term</em>}'.

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

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

+   * @return the meta object for class '<em>VLS Tff Term</em>'.

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

+   * @generated

+   */

+  EClass getVLSTffTerm();

+

+  /**

+   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDeclaration <em>VLS Declaration</em>}'.

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

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

+   * @return the meta object for class '<em>VLS Declaration</em>'.

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

+   * @generated

+   */

+  EClass getVLSDeclaration();

+

+  /**

+   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOtherDeclaration <em>VLS Other Declaration</em>}'.

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

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

+   * @return the meta object for class '<em>VLS Other Declaration</em>'.

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

+   * @generated

+   */

+  EClass getVLSOtherDeclaration();

+

+  /**

+   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration <em>VLS Variable Declaration</em>}'.

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

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

+   * @return the meta object for class '<em>VLS Variable Declaration</em>'.

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

+   * @generated

+   */

+  EClass getVLSVariableDeclaration();

+

+  /**

+   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef <em>VLS Type Def</em>}'.

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

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

+   * @return the meta object for class '<em>VLS Type Def</em>'.

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

+   * @generated

+   */

+  EClass getVLSTypeDef();

+

+  /**

+   * Returns the meta object for the containment reference '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getTypeSig <em>Type Sig</em>}'.

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

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

+   * @return the meta object for the containment reference '<em>Type Sig</em>'.

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getTypeSig()

+   * @see #getVLSTypeDef()

+   * @generated

+   */

+  EReference getVLSTypeDef_TypeSig();

+

+  /**

+   * Returns the meta object for the containment reference '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getMapsTo <em>Maps To</em>}'.

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

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

+   * @return the meta object for the containment reference '<em>Maps To</em>'.

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getMapsTo()

+   * @see #getVLSTypeDef()

+   * @generated

+   */

+  EReference getVLSTypeDef_MapsTo();

+

+  /**

+   * Returns the meta object for the containment reference '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getInitType <em>Init Type</em>}'.

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

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

+   * @return the meta object for the containment reference '<em>Init Type</em>'.

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getInitType()

+   * @see #getVLSTypeDef()

+   * @generated

+   */

+  EReference getVLSTypeDef_InitType();

+

+  /**

+   * Returns the meta object for the containment reference '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getNextType <em>Next Type</em>}'.

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

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

+   * @return the meta object for the containment reference '<em>Next Type</em>'.

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef#getNextType()

+   * @see #getVLSTypeDef()

+   * @generated

+   */

+  EReference getVLSTypeDef_NextType();

+

+  /**

    * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm <em>VLS Term</em>}'.

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

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

@@ -1603,6 +1915,17 @@ public interface VampireLanguagePackage extends EPackage
   EClass getVLSTerm();

 

   /**

+   * Returns the meta object for the containment reference '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm#getType <em>Type</em>}'.

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

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

+   * @return the meta object for the containment reference '<em>Type</em>'.

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm#getType()

+   * @see #getVLSTerm()

+   * @generated

+   */

+  EReference getVLSTerm_Type();

+

+  /**

    * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable <em>VLS Variable</em>}'.

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

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

@@ -1677,6 +2000,57 @@ public interface VampireLanguagePackage extends EPackage
   EAttribute getVLSDefinedTerm_Value();

 

   /**

+   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSSatisfiable <em>VLS Satisfiable</em>}'.

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

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

+   * @return the meta object for class '<em>VLS Satisfiable</em>'.

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

+   * @generated

+   */

+  EClass getVLSSatisfiable();

+

+  /**

+   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSWarning <em>VLS Warning</em>}'.

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

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

+   * @return the meta object for class '<em>VLS Warning</em>'.

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

+   * @generated

+   */

+  EClass getVLSWarning();

+

+  /**

+   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying <em>VLS Trying</em>}'.

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

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

+   * @return the meta object for class '<em>VLS Trying</em>'.

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

+   * @generated

+   */

+  EClass getVLSTrying();

+

+  /**

+   * Returns the meta object for the attribute '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying#getName <em>Name</em>}'.

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

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

+   * @return the meta object for the attribute '<em>Name</em>'.

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying#getName()

+   * @see #getVLSTrying()

+   * @generated

+   */

+  EAttribute getVLSTrying_Name();

+

+  /**

+   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFiniteModel <em>VLS Finite Model</em>}'.

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

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

+   * @return the meta object for class '<em>VLS Finite Model</em>'.

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

+   * @generated

+   */

+  EClass getVLSFiniteModel();

+

+  /**

    * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent <em>VLS Equivalent</em>}'.

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

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

@@ -2229,26 +2603,6 @@ public interface VampireLanguagePackage extends EPackage
   EClass getVLSInt();

 

   /**

-   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSReal <em>VLS Real</em>}'.

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

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

-   * @return the meta object for class '<em>VLS Real</em>'.

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

-   * @generated

-   */

-  EClass getVLSReal();

-

-  /**

-   * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSRational <em>VLS Rational</em>}'.

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

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

-   * @return the meta object for class '<em>VLS Rational</em>'.

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

-   * @generated

-   */

-  EClass getVLSRational();

-

-  /**

    * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDoubleQuote <em>VLS Double Quote</em>}'.

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

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

@@ -2292,14 +2646,6 @@ public interface VampireLanguagePackage extends EPackage
     EClass VAMPIRE_MODEL = eINSTANCE.getVampireModel();

 

     /**

-     * The meta object literal for the '<em><b>Includes</b></em>' containment reference list feature.

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

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

-     * @generated

-     */

-    EReference VAMPIRE_MODEL__INCLUDES = eINSTANCE.getVampireModel_Includes();

-

-    /**

      * The meta object literal for the '<em><b>Comments</b></em>' containment reference list feature.

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

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

@@ -2332,50 +2678,6 @@ public interface VampireLanguagePackage extends EPackage
     EReference VAMPIRE_MODEL__TFFORMULAS = eINSTANCE.getVampireModel_Tfformulas();

 

     /**

-     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSIncludeImpl <em>VLS Include</em>}' class.

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

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

-     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSIncludeImpl

-     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSInclude()

-     * @generated

-     */

-    EClass VLS_INCLUDE = eINSTANCE.getVLSInclude();

-

-    /**

-     * The meta object literal for the '<em><b>File Name</b></em>' attribute feature.

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

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

-     * @generated

-     */

-    EAttribute VLS_INCLUDE__FILE_NAME = eINSTANCE.getVLSInclude_FileName();

-

-    /**

-     * The meta object literal for the '<em><b>Names</b></em>' containment reference list feature.

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

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

-     * @generated

-     */

-    EReference VLS_INCLUDE__NAMES = eINSTANCE.getVLSInclude_Names();

-

-    /**

-     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSNameImpl <em>VLS Name</em>}' class.

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

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

-     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSNameImpl

-     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSName()

-     * @generated

-     */

-    EClass VLS_NAME = eINSTANCE.getVLSName();

-

-    /**

-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

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

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

-     * @generated

-     */

-    EAttribute VLS_NAME__NAME = eINSTANCE.getVLSName_Name();

-

-    /**

      * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSCommentImpl <em>VLS Comment</em>}' class.

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

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

@@ -2404,16 +2706,6 @@ public interface VampireLanguagePackage extends EPackage
     EClass VLS_CONFIRMATIONS = eINSTANCE.getVLSConfirmations();

 

     /**

-     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSSatisfiableImpl <em>VLS Satisfiable</em>}' class.

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

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

-     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSSatisfiableImpl

-     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSSatisfiable()

-     * @generated

-     */

-    EClass VLS_SATISFIABLE = eINSTANCE.getVLSSatisfiable();

-

-    /**

      * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFofFormulaImpl <em>VLS Fof Formula</em>}' class.

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

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

@@ -2474,12 +2766,12 @@ public interface VampireLanguagePackage extends EPackage
     EAttribute VLS_TFF_FORMULA__NAME = eINSTANCE.getVLSTffFormula_Name();

 

     /**

-     * The meta object literal for the '<em><b>Fof Role</b></em>' attribute feature.

+     * The meta object literal for the '<em><b>Tff Role</b></em>' attribute feature.

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

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

      * @generated

      */

-    EAttribute VLS_TFF_FORMULA__FOF_ROLE = eINSTANCE.getVLSTffFormula_FofRole();

+    EAttribute VLS_TFF_FORMULA__TFF_ROLE = eINSTANCE.getVLSTffFormula_TffRole();

 

     /**

      * The meta object literal for the '<em><b>Fof Formula</b></em>' containment reference feature.

@@ -2532,6 +2824,88 @@ public interface VampireLanguagePackage extends EPackage
     EReference VLS_ANNOTATION__TERMS = eINSTANCE.getVLSAnnotation_Terms();

 

     /**

+     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTffTermImpl <em>VLS Tff Term</em>}' class.

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

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

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTffTermImpl

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTffTerm()

+     * @generated

+     */

+    EClass VLS_TFF_TERM = eINSTANCE.getVLSTffTerm();

+

+    /**

+     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDeclarationImpl <em>VLS Declaration</em>}' class.

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

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

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDeclarationImpl

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSDeclaration()

+     * @generated

+     */

+    EClass VLS_DECLARATION = eINSTANCE.getVLSDeclaration();

+

+    /**

+     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSOtherDeclarationImpl <em>VLS Other Declaration</em>}' class.

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

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

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSOtherDeclarationImpl

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSOtherDeclaration()

+     * @generated

+     */

+    EClass VLS_OTHER_DECLARATION = eINSTANCE.getVLSOtherDeclaration();

+

+    /**

+     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableDeclarationImpl <em>VLS Variable Declaration</em>}' class.

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

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

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableDeclarationImpl

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSVariableDeclaration()

+     * @generated

+     */

+    EClass VLS_VARIABLE_DECLARATION = eINSTANCE.getVLSVariableDeclaration();

+

+    /**

+     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTypeDefImpl <em>VLS Type Def</em>}' class.

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

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

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTypeDefImpl

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTypeDef()

+     * @generated

+     */

+    EClass VLS_TYPE_DEF = eINSTANCE.getVLSTypeDef();

+

+    /**

+     * The meta object literal for the '<em><b>Type Sig</b></em>' containment reference feature.

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

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

+     * @generated

+     */

+    EReference VLS_TYPE_DEF__TYPE_SIG = eINSTANCE.getVLSTypeDef_TypeSig();

+

+    /**

+     * The meta object literal for the '<em><b>Maps To</b></em>' containment reference feature.

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

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

+     * @generated

+     */

+    EReference VLS_TYPE_DEF__MAPS_TO = eINSTANCE.getVLSTypeDef_MapsTo();

+

+    /**

+     * The meta object literal for the '<em><b>Init Type</b></em>' containment reference feature.

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

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

+     * @generated

+     */

+    EReference VLS_TYPE_DEF__INIT_TYPE = eINSTANCE.getVLSTypeDef_InitType();

+

+    /**

+     * The meta object literal for the '<em><b>Next Type</b></em>' containment reference feature.

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

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

+     * @generated

+     */

+    EReference VLS_TYPE_DEF__NEXT_TYPE = eINSTANCE.getVLSTypeDef_NextType();

+

+    /**

      * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTermImpl <em>VLS Term</em>}' class.

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

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

@@ -2542,6 +2916,14 @@ public interface VampireLanguagePackage extends EPackage
     EClass VLS_TERM = eINSTANCE.getVLSTerm();

 

     /**

+     * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.

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

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

+     * @generated

+     */

+    EReference VLS_TERM__TYPE = eINSTANCE.getVLSTerm_Type();

+

+    /**

      * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableImpl <em>VLS Variable</em>}' class.

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

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

@@ -2604,6 +2986,54 @@ public interface VampireLanguagePackage extends EPackage
     EAttribute VLS_DEFINED_TERM__VALUE = eINSTANCE.getVLSDefinedTerm_Value();

 

     /**

+     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSSatisfiableImpl <em>VLS Satisfiable</em>}' class.

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

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

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSSatisfiableImpl

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSSatisfiable()

+     * @generated

+     */

+    EClass VLS_SATISFIABLE = eINSTANCE.getVLSSatisfiable();

+

+    /**

+     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSWarningImpl <em>VLS Warning</em>}' class.

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

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

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSWarningImpl

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSWarning()

+     * @generated

+     */

+    EClass VLS_WARNING = eINSTANCE.getVLSWarning();

+

+    /**

+     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTryingImpl <em>VLS Trying</em>}' class.

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

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

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTryingImpl

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTrying()

+     * @generated

+     */

+    EClass VLS_TRYING = eINSTANCE.getVLSTrying();

+

+    /**

+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

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

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

+     * @generated

+     */

+    EAttribute VLS_TRYING__NAME = eINSTANCE.getVLSTrying_Name();

+

+    /**

+     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFiniteModelImpl <em>VLS Finite Model</em>}' class.

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

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

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFiniteModelImpl

+     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSFiniteModel()

+     * @generated

+     */

+    EClass VLS_FINITE_MODEL = eINSTANCE.getVLSFiniteModel();

+

+    /**

      * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSEquivalentImpl <em>VLS Equivalent</em>}' class.

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

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

@@ -3060,26 +3490,6 @@ public interface VampireLanguagePackage extends EPackage
     EClass VLS_INT = eINSTANCE.getVLSInt();

 

     /**

-     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSRealImpl <em>VLS Real</em>}' class.

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

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

-     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSRealImpl

-     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSReal()

-     * @generated

-     */

-    EClass VLS_REAL = eINSTANCE.getVLSReal();

-

-    /**

-     * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSRationalImpl <em>VLS Rational</em>}' class.

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

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

-     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSRationalImpl

-     * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSRational()

-     * @generated

-     */

-    EClass VLS_RATIONAL = eINSTANCE.getVLSRational();

-

-    /**

      * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDoubleQuoteImpl <em>VLS Double Quote</em>}' class.

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

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

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireModel.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireModel.java
index be0e2f59..af1386f1 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireModel.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireModel.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:

  * </p>

  * <ul>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireModel#getIncludes <em>Includes</em>}</li>

  *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireModel#getComments <em>Comments</em>}</li>

  *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireModel#getConfirmations <em>Confirmations</em>}</li>

  *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireModel#getFormulas <em>Formulas</em>}</li>

@@ -30,22 +29,6 @@ import org.eclipse.emf.ecore.EObject;
 public interface VampireModel extends EObject

 {

   /**

-   * Returns the value of the '<em><b>Includes</b></em>' containment reference list.

-   * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInclude}.

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

-   * <p>

-   * If the meaning of the '<em>Includes</em>' containment reference list isn't clear,

-   * there really should be more of a description here...

-   * </p>

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

-   * @return the value of the '<em>Includes</em>' containment reference list.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVampireModel_Includes()

-   * @model containment="true"

-   * @generated

-   */

-  EList<VLSInclude> getIncludes();

-

-  /**

    * Returns the value of the '<em><b>Comments</b></em>' containment reference list.

    * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment}.

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

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRationalImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDeclarationImpl.java
index c0960e3f..bb913d80 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRationalImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDeclarationImpl.java
@@ -1,41 +1,41 @@
-/**

- * generated by Xtext 2.14.0

- */

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

-

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

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

-

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

-

-/**

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

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

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

- *

- * @generated

- */

-public class VLSRationalImpl extends VLSDefinedTermImpl implements VLSRational

-{

-  /**

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

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

-   * @generated

-   */

-  protected VLSRationalImpl()

-  {

-    super();

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  protected EClass eStaticClass()

-  {

-    return VampireLanguagePackage.Literals.VLS_RATIONAL;

-  }

-

-} //VLSRationalImpl

+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDeclaration;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>VLS Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class VLSDeclarationImpl extends VLSTffTermImpl implements VLSDeclaration
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected VLSDeclarationImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return VampireLanguagePackage.Literals.VLS_DECLARATION;
+  }
+
+} //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 322e6710..115c7a23 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.VLSVariable;

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

 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<VLSVariable> variables;

+  protected EList<VLSVariableDeclaration> 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<VLSVariable> getVariables()

+  public EList<VLSVariableDeclaration> getVariables()

   {

     if (variables == null)

     {

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

+      variables = new EObjectContainmentEList<VLSVariableDeclaration>(VLSVariableDeclaration.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 VLSVariable>)newValue);

+        getVariables().addAll((Collection<? extends VLSVariableDeclaration>)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/VLSFiniteModelImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFiniteModelImpl.java
new file mode 100644
index 00000000..86416737
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSFiniteModelImpl.java
@@ -0,0 +1,41 @@
+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFiniteModel;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>VLS Finite Model</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class VLSFiniteModelImpl extends VLSConfirmationsImpl implements VLSFiniteModel
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected VLSFiniteModelImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return VampireLanguagePackage.Literals.VLS_FINITE_MODEL;
+  }
+
+} //VLSFiniteModelImpl
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIncludeImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIncludeImpl.java
deleted file mode 100644
index 47a9f4c6..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSIncludeImpl.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/**

- * generated by Xtext 2.14.0

- */

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

-

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

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

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

-

-import java.util.Collection;

-

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

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

-

-import org.eclipse.emf.common.util.EList;

-

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

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

-

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

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

-

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.InternalEList;

-

-/**

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

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

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

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSIncludeImpl#getFileName <em>File Name</em>}</li>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSIncludeImpl#getNames <em>Names</em>}</li>

- * </ul>

- *

- * @generated

- */

-public class VLSIncludeImpl extends MinimalEObjectImpl.Container implements VLSInclude

-{

-  /**

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

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

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

-   * @see #getFileName()

-   * @generated

-   * @ordered

-   */

-  protected static final String FILE_NAME_EDEFAULT = null;

-

-  /**

-   * The cached value of the '{@link #getFileName() <em>File Name</em>}' attribute.

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

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

-   * @see #getFileName()

-   * @generated

-   * @ordered

-   */

-  protected String fileName = FILE_NAME_EDEFAULT;

-

-  /**

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

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

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

-   * @see #getNames()

-   * @generated

-   * @ordered

-   */

-  protected EList<VLSName> names;

-

-  /**

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

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

-   * @generated

-   */

-  protected VLSIncludeImpl()

-  {

-    super();

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  protected EClass eStaticClass()

-  {

-    return VampireLanguagePackage.Literals.VLS_INCLUDE;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  public String getFileName()

-  {

-    return fileName;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  public void setFileName(String newFileName)

-  {

-    String oldFileName = fileName;

-    fileName = newFileName;

-    if (eNotificationRequired())

-      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_INCLUDE__FILE_NAME, oldFileName, fileName));

-  }

-

-  /**

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

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

-   * @generated

-   */

-  public EList<VLSName> getNames()

-  {

-    if (names == null)

-    {

-      names = new EObjectContainmentEList<VLSName>(VLSName.class, this, VampireLanguagePackage.VLS_INCLUDE__NAMES);

-    }

-    return names;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

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

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_INCLUDE__NAMES:

-        return ((InternalEList<?>)getNames()).basicRemove(otherEnd, 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_INCLUDE__FILE_NAME:

-        return getFileName();

-      case VampireLanguagePackage.VLS_INCLUDE__NAMES:

-        return getNames();

-    }

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

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @SuppressWarnings("unchecked")

-  @Override

-  public void eSet(int featureID, Object newValue)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_INCLUDE__FILE_NAME:

-        setFileName((String)newValue);

-        return;

-      case VampireLanguagePackage.VLS_INCLUDE__NAMES:

-        getNames().clear();

-        getNames().addAll((Collection<? extends VLSName>)newValue);

-        return;

-    }

-    super.eSet(featureID, newValue);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public void eUnset(int featureID)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_INCLUDE__FILE_NAME:

-        setFileName(FILE_NAME_EDEFAULT);

-        return;

-      case VampireLanguagePackage.VLS_INCLUDE__NAMES:

-        getNames().clear();

-        return;

-    }

-    super.eUnset(featureID);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public boolean eIsSet(int featureID)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_INCLUDE__FILE_NAME:

-        return FILE_NAME_EDEFAULT == null ? fileName != null : !FILE_NAME_EDEFAULT.equals(fileName);

-      case VampireLanguagePackage.VLS_INCLUDE__NAMES:

-        return names != null && !names.isEmpty();

-    }

-    return super.eIsSet(featureID);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public String toString()

-  {

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

-

-    StringBuilder result = new StringBuilder(super.toString());

-    result.append(" (fileName: ");

-    result.append(fileName);

-    result.append(')');

-    return result.toString();

-  }

-

-} //VLSIncludeImpl

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
new file mode 100644
index 00000000..c5abc76a
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOtherDeclarationImpl.java
@@ -0,0 +1,41 @@
+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOtherDeclaration;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>VLS Other Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class VLSOtherDeclarationImpl extends VLSDeclarationImpl implements VLSOtherDeclaration
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected VLSOtherDeclarationImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return VampireLanguagePackage.Literals.VLS_OTHER_DECLARATION;
+  }
+
+} //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 b556819f..0ea49b4c 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,22 +4,43 @@
 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.MinimalEObjectImpl;

+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 MinimalEObjectImpl.Container implements VLSTerm

+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

@@ -40,4 +61,134 @@ public class VLSTermImpl extends MinimalEObjectImpl.Container 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/VLSTffFormulaImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTffFormulaImpl.java
index b4ff1184..d1ab6e93 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTffFormulaImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTffFormulaImpl.java
@@ -4,8 +4,8 @@
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;

 

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

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

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

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

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

 

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

@@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * </p>

  * <ul>

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

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTffFormulaImpl#getFofRole <em>Fof Role</em>}</li>

+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTffFormulaImpl#getTffRole <em>Tff Role</em>}</li>

  *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTffFormulaImpl#getFofFormula <em>Fof Formula</em>}</li>

  *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTffFormulaImpl#getAnnotations <em>Annotations</em>}</li>

  * </ul>

@@ -56,24 +56,24 @@ public class VLSTffFormulaImpl extends MinimalEObjectImpl.Container implements V
   protected String name = NAME_EDEFAULT;

 

   /**

-   * The default value of the '{@link #getFofRole() <em>Fof Role</em>}' attribute.

+   * The default value of the '{@link #getTffRole() <em>Tff Role</em>}' attribute.

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

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

-   * @see #getFofRole()

+   * @see #getTffRole()

    * @generated

    * @ordered

    */

-  protected static final String FOF_ROLE_EDEFAULT = null;

+  protected static final String TFF_ROLE_EDEFAULT = null;

 

   /**

-   * The cached value of the '{@link #getFofRole() <em>Fof Role</em>}' attribute.

+   * The cached value of the '{@link #getTffRole() <em>Tff Role</em>}' attribute.

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

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

-   * @see #getFofRole()

+   * @see #getTffRole()

    * @generated

    * @ordered

    */

-  protected String fofRole = FOF_ROLE_EDEFAULT;

+  protected String tffRole = TFF_ROLE_EDEFAULT;

 

   /**

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

@@ -83,7 +83,7 @@ public class VLSTffFormulaImpl extends MinimalEObjectImpl.Container implements V
    * @generated

    * @ordered

    */

-  protected VLSTerm fofFormula;

+  protected VLSTffTerm fofFormula;

 

   /**

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

@@ -144,9 +144,9 @@ public class VLSTffFormulaImpl extends MinimalEObjectImpl.Container implements V
    * <!-- end-user-doc -->

    * @generated

    */

-  public String getFofRole()

+  public String getTffRole()

   {

-    return fofRole;

+    return tffRole;

   }

 

   /**

@@ -154,12 +154,12 @@ public class VLSTffFormulaImpl extends MinimalEObjectImpl.Container implements V
    * <!-- end-user-doc -->

    * @generated

    */

-  public void setFofRole(String newFofRole)

+  public void setTffRole(String newTffRole)

   {

-    String oldFofRole = fofRole;

-    fofRole = newFofRole;

+    String oldTffRole = tffRole;

+    tffRole = newTffRole;

     if (eNotificationRequired())

-      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TFF_FORMULA__FOF_ROLE, oldFofRole, fofRole));

+      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TFF_FORMULA__TFF_ROLE, oldTffRole, tffRole));

   }

 

   /**

@@ -167,7 +167,7 @@ public class VLSTffFormulaImpl extends MinimalEObjectImpl.Container implements V
    * <!-- end-user-doc -->

    * @generated

    */

-  public VLSTerm getFofFormula()

+  public VLSTffTerm getFofFormula()

   {

     return fofFormula;

   }

@@ -177,9 +177,9 @@ public class VLSTffFormulaImpl extends MinimalEObjectImpl.Container implements V
    * <!-- end-user-doc -->

    * @generated

    */

-  public NotificationChain basicSetFofFormula(VLSTerm newFofFormula, NotificationChain msgs)

+  public NotificationChain basicSetFofFormula(VLSTffTerm newFofFormula, NotificationChain msgs)

   {

-    VLSTerm oldFofFormula = fofFormula;

+    VLSTffTerm oldFofFormula = fofFormula;

     fofFormula = newFofFormula;

     if (eNotificationRequired())

     {

@@ -194,7 +194,7 @@ public class VLSTffFormulaImpl extends MinimalEObjectImpl.Container implements V
    * <!-- end-user-doc -->

    * @generated

    */

-  public void setFofFormula(VLSTerm newFofFormula)

+  public void setFofFormula(VLSTffTerm newFofFormula)

   {

     if (newFofFormula != fofFormula)

     {

@@ -288,8 +288,8 @@ public class VLSTffFormulaImpl extends MinimalEObjectImpl.Container implements V
     {

       case VampireLanguagePackage.VLS_TFF_FORMULA__NAME:

         return getName();

-      case VampireLanguagePackage.VLS_TFF_FORMULA__FOF_ROLE:

-        return getFofRole();

+      case VampireLanguagePackage.VLS_TFF_FORMULA__TFF_ROLE:

+        return getTffRole();

       case VampireLanguagePackage.VLS_TFF_FORMULA__FOF_FORMULA:

         return getFofFormula();

       case VampireLanguagePackage.VLS_TFF_FORMULA__ANNOTATIONS:

@@ -311,11 +311,11 @@ public class VLSTffFormulaImpl extends MinimalEObjectImpl.Container implements V
       case VampireLanguagePackage.VLS_TFF_FORMULA__NAME:

         setName((String)newValue);

         return;

-      case VampireLanguagePackage.VLS_TFF_FORMULA__FOF_ROLE:

-        setFofRole((String)newValue);

+      case VampireLanguagePackage.VLS_TFF_FORMULA__TFF_ROLE:

+        setTffRole((String)newValue);

         return;

       case VampireLanguagePackage.VLS_TFF_FORMULA__FOF_FORMULA:

-        setFofFormula((VLSTerm)newValue);

+        setFofFormula((VLSTffTerm)newValue);

         return;

       case VampireLanguagePackage.VLS_TFF_FORMULA__ANNOTATIONS:

         setAnnotations((VLSAnnotation)newValue);

@@ -337,11 +337,11 @@ public class VLSTffFormulaImpl extends MinimalEObjectImpl.Container implements V
       case VampireLanguagePackage.VLS_TFF_FORMULA__NAME:

         setName(NAME_EDEFAULT);

         return;

-      case VampireLanguagePackage.VLS_TFF_FORMULA__FOF_ROLE:

-        setFofRole(FOF_ROLE_EDEFAULT);

+      case VampireLanguagePackage.VLS_TFF_FORMULA__TFF_ROLE:

+        setTffRole(TFF_ROLE_EDEFAULT);

         return;

       case VampireLanguagePackage.VLS_TFF_FORMULA__FOF_FORMULA:

-        setFofFormula((VLSTerm)null);

+        setFofFormula((VLSTffTerm)null);

         return;

       case VampireLanguagePackage.VLS_TFF_FORMULA__ANNOTATIONS:

         setAnnotations((VLSAnnotation)null);

@@ -362,8 +362,8 @@ public class VLSTffFormulaImpl extends MinimalEObjectImpl.Container implements V
     {

       case VampireLanguagePackage.VLS_TFF_FORMULA__NAME:

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

-      case VampireLanguagePackage.VLS_TFF_FORMULA__FOF_ROLE:

-        return FOF_ROLE_EDEFAULT == null ? fofRole != null : !FOF_ROLE_EDEFAULT.equals(fofRole);

+      case VampireLanguagePackage.VLS_TFF_FORMULA__TFF_ROLE:

+        return TFF_ROLE_EDEFAULT == null ? tffRole != null : !TFF_ROLE_EDEFAULT.equals(tffRole);

       case VampireLanguagePackage.VLS_TFF_FORMULA__FOF_FORMULA:

         return fofFormula != null;

       case VampireLanguagePackage.VLS_TFF_FORMULA__ANNOTATIONS:

@@ -385,8 +385,8 @@ public class VLSTffFormulaImpl extends MinimalEObjectImpl.Container implements V
     StringBuilder result = new StringBuilder(super.toString());

     result.append(" (name: ");

     result.append(name);

-    result.append(", fofRole: ");

-    result.append(fofRole);

+    result.append(", tffRole: ");

+    result.append(tffRole);

     result.append(')');

     return result.toString();

   }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTffTermImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTffTermImpl.java
new file mode 100644
index 00000000..fc074395
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTffTermImpl.java
@@ -0,0 +1,43 @@
+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffTerm;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>VLS Tff Term</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class VLSTffTermImpl extends MinimalEObjectImpl.Container implements VLSTffTerm
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected VLSTffTermImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return VampireLanguagePackage.Literals.VLS_TFF_TERM;
+  }
+
+} //VLSTffTermImpl
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNameImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTryingImpl.java
index 6863c49c..77e5cc25 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSNameImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTryingImpl.java
@@ -1,178 +1,177 @@
-/**

- * generated by Xtext 2.14.0

- */

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

-

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

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

-

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

-

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

-

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

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

-

-/**

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

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

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

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

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

- * </ul>

- *

- * @generated

- */

-public class VLSNameImpl extends MinimalEObjectImpl.Container implements VLSName

-{

-  /**

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

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

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

-   * @see #getName()

-   * @generated

-   * @ordered

-   */

-  protected static final String NAME_EDEFAULT = null;

-

-  /**

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

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

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

-   * @see #getName()

-   * @generated

-   * @ordered

-   */

-  protected String name = NAME_EDEFAULT;

-

-  /**

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

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

-   * @generated

-   */

-  protected VLSNameImpl()

-  {

-    super();

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  protected EClass eStaticClass()

-  {

-    return VampireLanguagePackage.Literals.VLS_NAME;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  public String getName()

-  {

-    return name;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  public void setName(String newName)

-  {

-    String oldName = name;

-    name = newName;

-    if (eNotificationRequired())

-      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_NAME__NAME, oldName, name));

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

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

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_NAME__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_NAME__NAME:

-        setName((String)newValue);

-        return;

-    }

-    super.eSet(featureID, newValue);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public void eUnset(int featureID)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_NAME__NAME:

-        setName(NAME_EDEFAULT);

-        return;

-    }

-    super.eUnset(featureID);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public boolean eIsSet(int featureID)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_NAME__NAME:

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

-    }

-    return super.eIsSet(featureID);

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  public String toString()

-  {

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

-

-    StringBuilder result = new StringBuilder(super.toString());

-    result.append(" (name: ");

-    result.append(name);

-    result.append(')');

-    return result.toString();

-  }

-

-} //VLSNameImpl

+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>VLS Trying</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTryingImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class VLSTryingImpl extends VLSConfirmationsImpl implements VLSTrying
+{
+  /**
+   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected static final String NAME_EDEFAULT = null;
+
+  /**
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected String name = NAME_EDEFAULT;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected VLSTryingImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return VampireLanguagePackage.Literals.VLS_TRYING;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setName(String newName)
+  {
+    String oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TRYING__NAME, oldName, name));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_TRYING__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_TRYING__NAME:
+        setName((String)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_TRYING__NAME:
+        setName(NAME_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_TRYING__NAME:
+        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+    }
+    return super.eIsSet(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (name: ");
+    result.append(name);
+    result.append(')');
+    return result.toString();
+  }
+
+} //VLSTryingImpl
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTypeDefImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTypeDefImpl.java
new file mode 100644
index 00000000..d16f5fe4
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTypeDefImpl.java
@@ -0,0 +1,408 @@
+/**
+ * generated by Xtext 2.14.0
+ */
+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;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>VLS Type Def</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTypeDefImpl#getTypeSig <em>Type Sig</em>}</li>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTypeDefImpl#getMapsTo <em>Maps To</em>}</li>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTypeDefImpl#getInitType <em>Init Type</em>}</li>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTypeDefImpl#getNextType <em>Next Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class VLSTypeDefImpl extends MinimalEObjectImpl.Container implements VLSTypeDef
+{
+  /**
+   * The cached value of the '{@link #getTypeSig() <em>Type Sig</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getTypeSig()
+   * @generated
+   * @ordered
+   */
+  protected VLSTypeDef typeSig;
+
+  /**
+   * The cached value of the '{@link #getMapsTo() <em>Maps To</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getMapsTo()
+   * @generated
+   * @ordered
+   */
+  protected VLSTerm mapsTo;
+
+  /**
+   * The cached value of the '{@link #getInitType() <em>Init Type</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getInitType()
+   * @generated
+   * @ordered
+   */
+  protected VLSTerm initType;
+
+  /**
+   * The cached value of the '{@link #getNextType() <em>Next Type</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getNextType()
+   * @generated
+   * @ordered
+   */
+  protected VLSTerm nextType;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected VLSTypeDefImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return VampireLanguagePackage.Literals.VLS_TYPE_DEF;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public VLSTypeDef getTypeSig()
+  {
+    return typeSig;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetTypeSig(VLSTypeDef newTypeSig, NotificationChain msgs)
+  {
+    VLSTypeDef oldTypeSig = typeSig;
+    typeSig = newTypeSig;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TYPE_DEF__TYPE_SIG, oldTypeSig, newTypeSig);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setTypeSig(VLSTypeDef newTypeSig)
+  {
+    if (newTypeSig != typeSig)
+    {
+      NotificationChain msgs = null;
+      if (typeSig != null)
+        msgs = ((InternalEObject)typeSig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_TYPE_DEF__TYPE_SIG, null, msgs);
+      if (newTypeSig != null)
+        msgs = ((InternalEObject)newTypeSig).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_TYPE_DEF__TYPE_SIG, null, msgs);
+      msgs = basicSetTypeSig(newTypeSig, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TYPE_DEF__TYPE_SIG, newTypeSig, newTypeSig));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public VLSTerm getMapsTo()
+  {
+    return mapsTo;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetMapsTo(VLSTerm newMapsTo, NotificationChain msgs)
+  {
+    VLSTerm oldMapsTo = mapsTo;
+    mapsTo = newMapsTo;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TYPE_DEF__MAPS_TO, oldMapsTo, newMapsTo);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setMapsTo(VLSTerm newMapsTo)
+  {
+    if (newMapsTo != mapsTo)
+    {
+      NotificationChain msgs = null;
+      if (mapsTo != null)
+        msgs = ((InternalEObject)mapsTo).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_TYPE_DEF__MAPS_TO, null, msgs);
+      if (newMapsTo != null)
+        msgs = ((InternalEObject)newMapsTo).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_TYPE_DEF__MAPS_TO, null, msgs);
+      msgs = basicSetMapsTo(newMapsTo, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TYPE_DEF__MAPS_TO, newMapsTo, newMapsTo));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public VLSTerm getInitType()
+  {
+    return initType;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetInitType(VLSTerm newInitType, NotificationChain msgs)
+  {
+    VLSTerm oldInitType = initType;
+    initType = newInitType;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TYPE_DEF__INIT_TYPE, oldInitType, newInitType);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setInitType(VLSTerm newInitType)
+  {
+    if (newInitType != initType)
+    {
+      NotificationChain msgs = null;
+      if (initType != null)
+        msgs = ((InternalEObject)initType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_TYPE_DEF__INIT_TYPE, null, msgs);
+      if (newInitType != null)
+        msgs = ((InternalEObject)newInitType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_TYPE_DEF__INIT_TYPE, null, msgs);
+      msgs = basicSetInitType(newInitType, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TYPE_DEF__INIT_TYPE, newInitType, newInitType));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public VLSTerm getNextType()
+  {
+    return nextType;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetNextType(VLSTerm newNextType, NotificationChain msgs)
+  {
+    VLSTerm oldNextType = nextType;
+    nextType = newNextType;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TYPE_DEF__NEXT_TYPE, oldNextType, newNextType);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setNextType(VLSTerm newNextType)
+  {
+    if (newNextType != nextType)
+    {
+      NotificationChain msgs = null;
+      if (nextType != null)
+        msgs = ((InternalEObject)nextType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_TYPE_DEF__NEXT_TYPE, null, msgs);
+      if (newNextType != null)
+        msgs = ((InternalEObject)newNextType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_TYPE_DEF__NEXT_TYPE, null, msgs);
+      msgs = basicSetNextType(newNextType, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TYPE_DEF__NEXT_TYPE, newNextType, newNextType));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_TYPE_DEF__TYPE_SIG:
+        return basicSetTypeSig(null, msgs);
+      case VampireLanguagePackage.VLS_TYPE_DEF__MAPS_TO:
+        return basicSetMapsTo(null, msgs);
+      case VampireLanguagePackage.VLS_TYPE_DEF__INIT_TYPE:
+        return basicSetInitType(null, msgs);
+      case VampireLanguagePackage.VLS_TYPE_DEF__NEXT_TYPE:
+        return basicSetNextType(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_TYPE_DEF__TYPE_SIG:
+        return getTypeSig();
+      case VampireLanguagePackage.VLS_TYPE_DEF__MAPS_TO:
+        return getMapsTo();
+      case VampireLanguagePackage.VLS_TYPE_DEF__INIT_TYPE:
+        return getInitType();
+      case VampireLanguagePackage.VLS_TYPE_DEF__NEXT_TYPE:
+        return getNextType();
+    }
+    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_TYPE_DEF__TYPE_SIG:
+        setTypeSig((VLSTypeDef)newValue);
+        return;
+      case VampireLanguagePackage.VLS_TYPE_DEF__MAPS_TO:
+        setMapsTo((VLSTerm)newValue);
+        return;
+      case VampireLanguagePackage.VLS_TYPE_DEF__INIT_TYPE:
+        setInitType((VLSTerm)newValue);
+        return;
+      case VampireLanguagePackage.VLS_TYPE_DEF__NEXT_TYPE:
+        setNextType((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_TYPE_DEF__TYPE_SIG:
+        setTypeSig((VLSTypeDef)null);
+        return;
+      case VampireLanguagePackage.VLS_TYPE_DEF__MAPS_TO:
+        setMapsTo((VLSTerm)null);
+        return;
+      case VampireLanguagePackage.VLS_TYPE_DEF__INIT_TYPE:
+        setInitType((VLSTerm)null);
+        return;
+      case VampireLanguagePackage.VLS_TYPE_DEF__NEXT_TYPE:
+        setNextType((VLSTerm)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_TYPE_DEF__TYPE_SIG:
+        return typeSig != null;
+      case VampireLanguagePackage.VLS_TYPE_DEF__MAPS_TO:
+        return mapsTo != null;
+      case VampireLanguagePackage.VLS_TYPE_DEF__INIT_TYPE:
+        return initType != null;
+      case VampireLanguagePackage.VLS_TYPE_DEF__NEXT_TYPE:
+        return nextType != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+} //VLSTypeDefImpl
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 696a4889..b9bfbe07 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
@@ -5,7 +5,7 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
 

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

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

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

+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<VLSVariable> variables;

+  protected EList<VLSVariableDeclaration> 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<VLSVariable> getVariables()

+  public EList<VLSVariableDeclaration> getVariables()

   {

     if (variables == null)

     {

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

+      variables = new EObjectContainmentEList<VLSVariableDeclaration>(VLSVariableDeclaration.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 VLSVariable>)newValue);

+        getVariables().addAll((Collection<? extends VLSVariableDeclaration>)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
new file mode 100644
index 00000000..0e6c0ef9
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableDeclarationImpl.java
@@ -0,0 +1,41 @@
+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>VLS Variable Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class VLSVariableDeclarationImpl extends VLSDeclarationImpl implements VLSVariableDeclaration
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected VLSVariableDeclarationImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return VampireLanguagePackage.Literals.VLS_VARIABLE_DECLARATION;
+  }
+
+} //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 9ebed3eb..1d38ddfb 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,12 +3,17 @@
  */

 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;

 

@@ -20,14 +25,25 @@ 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 VLSTermImpl implements VLSVariable

+public class VLSVariableImpl extends VLSVariableDeclarationImpl 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 -->

@@ -73,6 +89,54 @@ public class VLSVariableImpl extends VLSTermImpl implements VLSVariable
    * <!-- 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;

@@ -97,10 +161,28 @@ public class VLSVariableImpl extends VLSTermImpl implements VLSVariable
    * @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();

     }

@@ -117,6 +199,9 @@ public class VLSVariableImpl extends VLSTermImpl implements VLSVariable
   {

     switch (featureID)

     {

+      case VampireLanguagePackage.VLS_VARIABLE__TYPE:

+        setType((VLSTypeDef)newValue);

+        return;

       case VampireLanguagePackage.VLS_VARIABLE__NAME:

         setName((String)newValue);

         return;

@@ -134,6 +219,9 @@ public class VLSVariableImpl extends VLSTermImpl implements VLSVariable
   {

     switch (featureID)

     {

+      case VampireLanguagePackage.VLS_VARIABLE__TYPE:

+        setType((VLSTypeDef)null);

+        return;

       case VampireLanguagePackage.VLS_VARIABLE__NAME:

         setName(NAME_EDEFAULT);

         return;

@@ -151,6 +239,8 @@ public class VLSVariableImpl extends VLSTermImpl implements VLSVariable
   {

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

     }

@@ -163,6 +253,58 @@ public class VLSVariableImpl extends VLSTermImpl implements VLSVariable
    * @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/VLSRealImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSWarningImpl.java
index bedcde3e..34cb784d 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSRealImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSWarningImpl.java
@@ -1,41 +1,41 @@
-/**

- * generated by Xtext 2.14.0

- */

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

-

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

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

-

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

-

-/**

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

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

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

- *

- * @generated

- */

-public class VLSRealImpl extends VLSDefinedTermImpl implements VLSReal

-{

-  /**

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

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

-   * @generated

-   */

-  protected VLSRealImpl()

-  {

-    super();

-  }

-

-  /**

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

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

-   * @generated

-   */

-  @Override

-  protected EClass eStaticClass()

-  {

-    return VampireLanguagePackage.Literals.VLS_REAL;

-  }

-

-} //VLSRealImpl

+/**
+ * generated by Xtext 2.14.0
+ */
+package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
+
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSWarning;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>VLS Warning</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class VLSWarningImpl extends VLSConfirmationsImpl implements VLSWarning
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected VLSWarningImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return VampireLanguagePackage.Literals.VLS_WARNING;
+  }
+
+} //VLSWarningImpl
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguageFactoryImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguageFactoryImpl.java
index a6b1ac36..0e25a4cc 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguageFactoryImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguageFactoryImpl.java
@@ -66,18 +66,24 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
     switch (eClass.getClassifierID())

     {

       case VampireLanguagePackage.VAMPIRE_MODEL: return createVampireModel();

-      case VampireLanguagePackage.VLS_INCLUDE: return createVLSInclude();

-      case VampireLanguagePackage.VLS_NAME: return createVLSName();

       case VampireLanguagePackage.VLS_COMMENT: return createVLSComment();

       case VampireLanguagePackage.VLS_CONFIRMATIONS: return createVLSConfirmations();

-      case VampireLanguagePackage.VLS_SATISFIABLE: return createVLSSatisfiable();

       case VampireLanguagePackage.VLS_FOF_FORMULA: return createVLSFofFormula();

       case VampireLanguagePackage.VLS_TFF_FORMULA: return createVLSTffFormula();

       case VampireLanguagePackage.VLS_ANNOTATION: return createVLSAnnotation();

+      case VampireLanguagePackage.VLS_TFF_TERM: return createVLSTffTerm();

+      case VampireLanguagePackage.VLS_DECLARATION: return createVLSDeclaration();

+      case VampireLanguagePackage.VLS_OTHER_DECLARATION: return createVLSOtherDeclaration();

+      case VampireLanguagePackage.VLS_VARIABLE_DECLARATION: return createVLSVariableDeclaration();

+      case VampireLanguagePackage.VLS_TYPE_DEF: return createVLSTypeDef();

       case VampireLanguagePackage.VLS_TERM: return createVLSTerm();

       case VampireLanguagePackage.VLS_VARIABLE: return createVLSVariable();

       case VampireLanguagePackage.VLS_FUNCTION_AS_TERM: return createVLSFunctionAsTerm();

       case VampireLanguagePackage.VLS_DEFINED_TERM: return createVLSDefinedTerm();

+      case VampireLanguagePackage.VLS_SATISFIABLE: return createVLSSatisfiable();

+      case VampireLanguagePackage.VLS_WARNING: return createVLSWarning();

+      case VampireLanguagePackage.VLS_TRYING: return createVLSTrying();

+      case VampireLanguagePackage.VLS_FINITE_MODEL: return createVLSFiniteModel();

       case VampireLanguagePackage.VLS_EQUIVALENT: return createVLSEquivalent();

       case VampireLanguagePackage.VLS_IMPLIES: return createVLSImplies();

       case VampireLanguagePackage.VLS_REV_IMPLIES: return createVLSRevImplies();

@@ -98,8 +104,6 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
       case VampireLanguagePackage.VLS_FUNCTION: return createVLSFunction();

       case VampireLanguagePackage.VLS_LESS: return createVLSLess();

       case VampireLanguagePackage.VLS_INT: return createVLSInt();

-      case VampireLanguagePackage.VLS_REAL: return createVLSReal();

-      case VampireLanguagePackage.VLS_RATIONAL: return createVLSRational();

       case VampireLanguagePackage.VLS_DOUBLE_QUOTE: return createVLSDoubleQuote();

       default:

         throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

@@ -122,10 +126,10 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public VLSInclude createVLSInclude()

+  public VLSComment createVLSComment()

   {

-    VLSIncludeImpl vlsInclude = new VLSIncludeImpl();

-    return vlsInclude;

+    VLSCommentImpl vlsComment = new VLSCommentImpl();

+    return vlsComment;

   }

 

   /**

@@ -133,10 +137,10 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public VLSName createVLSName()

+  public VLSConfirmations createVLSConfirmations()

   {

-    VLSNameImpl vlsName = new VLSNameImpl();

-    return vlsName;

+    VLSConfirmationsImpl vlsConfirmations = new VLSConfirmationsImpl();

+    return vlsConfirmations;

   }

 

   /**

@@ -144,10 +148,10 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public VLSComment createVLSComment()

+  public VLSFofFormula createVLSFofFormula()

   {

-    VLSCommentImpl vlsComment = new VLSCommentImpl();

-    return vlsComment;

+    VLSFofFormulaImpl vlsFofFormula = new VLSFofFormulaImpl();

+    return vlsFofFormula;

   }

 

   /**

@@ -155,10 +159,10 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public VLSConfirmations createVLSConfirmations()

+  public VLSTffFormula createVLSTffFormula()

   {

-    VLSConfirmationsImpl vlsConfirmations = new VLSConfirmationsImpl();

-    return vlsConfirmations;

+    VLSTffFormulaImpl vlsTffFormula = new VLSTffFormulaImpl();

+    return vlsTffFormula;

   }

 

   /**

@@ -166,10 +170,10 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public VLSSatisfiable createVLSSatisfiable()

+  public VLSAnnotation createVLSAnnotation()

   {

-    VLSSatisfiableImpl vlsSatisfiable = new VLSSatisfiableImpl();

-    return vlsSatisfiable;

+    VLSAnnotationImpl vlsAnnotation = new VLSAnnotationImpl();

+    return vlsAnnotation;

   }

 

   /**

@@ -177,10 +181,10 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public VLSFofFormula createVLSFofFormula()

+  public VLSTffTerm createVLSTffTerm()

   {

-    VLSFofFormulaImpl vlsFofFormula = new VLSFofFormulaImpl();

-    return vlsFofFormula;

+    VLSTffTermImpl vlsTffTerm = new VLSTffTermImpl();

+    return vlsTffTerm;

   }

 

   /**

@@ -188,10 +192,10 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public VLSTffFormula createVLSTffFormula()

+  public VLSDeclaration createVLSDeclaration()

   {

-    VLSTffFormulaImpl vlsTffFormula = new VLSTffFormulaImpl();

-    return vlsTffFormula;

+    VLSDeclarationImpl vlsDeclaration = new VLSDeclarationImpl();

+    return vlsDeclaration;

   }

 

   /**

@@ -199,10 +203,32 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public VLSAnnotation createVLSAnnotation()

+  public VLSOtherDeclaration createVLSOtherDeclaration()

   {

-    VLSAnnotationImpl vlsAnnotation = new VLSAnnotationImpl();

-    return vlsAnnotation;

+    VLSOtherDeclarationImpl vlsOtherDeclaration = new VLSOtherDeclarationImpl();

+    return vlsOtherDeclaration;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public VLSVariableDeclaration createVLSVariableDeclaration()

+  {

+    VLSVariableDeclarationImpl vlsVariableDeclaration = new VLSVariableDeclarationImpl();

+    return vlsVariableDeclaration;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public VLSTypeDef createVLSTypeDef()

+  {

+    VLSTypeDefImpl vlsTypeDef = new VLSTypeDefImpl();

+    return vlsTypeDef;

   }

 

   /**

@@ -254,6 +280,50 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

+  public VLSSatisfiable createVLSSatisfiable()

+  {

+    VLSSatisfiableImpl vlsSatisfiable = new VLSSatisfiableImpl();

+    return vlsSatisfiable;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public VLSWarning createVLSWarning()

+  {

+    VLSWarningImpl vlsWarning = new VLSWarningImpl();

+    return vlsWarning;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public VLSTrying createVLSTrying()

+  {

+    VLSTryingImpl vlsTrying = new VLSTryingImpl();

+    return vlsTrying;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public VLSFiniteModel createVLSFiniteModel()

+  {

+    VLSFiniteModelImpl vlsFiniteModel = new VLSFiniteModelImpl();

+    return vlsFiniteModel;

+  }

+

+  /**

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

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

+   * @generated

+   */

   public VLSEquivalent createVLSEquivalent()

   {

     VLSEquivalentImpl vlsEquivalent = new VLSEquivalentImpl();

@@ -474,28 +544,6 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public VLSReal createVLSReal()

-  {

-    VLSRealImpl vlsReal = new VLSRealImpl();

-    return vlsReal;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  public VLSRational createVLSRational()

-  {

-    VLSRationalImpl vlsRational = new VLSRationalImpl();

-    return vlsRational;

-  }

-

-  /**

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

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

-   * @generated

-   */

   public VLSDoubleQuote createVLSDoubleQuote()

   {

     VLSDoubleQuoteImpl vlsDoubleQuote = new VLSDoubleQuoteImpl();

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 2907b35d..6b2b7085 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
@@ -9,34 +9,38 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAssignment;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment;

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

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

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

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

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

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

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

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

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

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

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

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

 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;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -69,56 +73,70 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  private EClass vlsIncludeEClass = null;

+  private EClass vlsCommentEClass = null;

 

   /**

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

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

    * @generated

    */

-  private EClass vlsNameEClass = null;

+  private EClass vlsConfirmationsEClass = null;

 

   /**

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

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

    * @generated

    */

-  private EClass vlsCommentEClass = null;

+  private EClass vlsFofFormulaEClass = null;

 

   /**

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

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

    * @generated

    */

-  private EClass vlsConfirmationsEClass = null;

+  private EClass vlsTffFormulaEClass = null;

 

   /**

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

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

    * @generated

    */

-  private EClass vlsSatisfiableEClass = null;

+  private EClass vlsAnnotationEClass = null;

 

   /**

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

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

    * @generated

    */

-  private EClass vlsFofFormulaEClass = null;

+  private EClass vlsTffTermEClass = null;

 

   /**

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

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

    * @generated

    */

-  private EClass vlsTffFormulaEClass = null;

+  private EClass vlsDeclarationEClass = null;

 

   /**

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

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

    * @generated

    */

-  private EClass vlsAnnotationEClass = null;

+  private EClass vlsOtherDeclarationEClass = null;

+

+  /**

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

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

+   * @generated

+   */

+  private EClass vlsVariableDeclarationEClass = null;

+

+  /**

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

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

+   * @generated

+   */

+  private EClass vlsTypeDefEClass = null;

 

   /**

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

@@ -153,6 +171,34 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

+  private EClass vlsSatisfiableEClass = null;

+

+  /**

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

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

+   * @generated

+   */

+  private EClass vlsWarningEClass = null;

+

+  /**

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

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

+   * @generated

+   */

+  private EClass vlsTryingEClass = null;

+

+  /**

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

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

+   * @generated

+   */

+  private EClass vlsFiniteModelEClass = null;

+

+  /**

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

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

+   * @generated

+   */

   private EClass vlsEquivalentEClass = null;

 

   /**

@@ -293,20 +339,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  private EClass vlsRealEClass = null;

-

-  /**

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

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

-   * @generated

-   */

-  private EClass vlsRationalEClass = null;

-

-  /**

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

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

-   * @generated

-   */

   private EClass vlsDoubleQuoteEClass = null;

 

   /**

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

    * @generated

    */

-  public EReference getVampireModel_Includes()

+  public EReference getVampireModel_Comments()

   {

     return (EReference)vampireModelEClass.getEStructuralFeatures().get(0);

   }

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

    * @generated

    */

-  public EReference getVampireModel_Comments()

+  public EReference getVampireModel_Confirmations()

   {

     return (EReference)vampireModelEClass.getEStructuralFeatures().get(1);

   }

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

    * @generated

    */

-  public EReference getVampireModel_Confirmations()

+  public EReference getVampireModel_Formulas()

   {

     return (EReference)vampireModelEClass.getEStructuralFeatures().get(2);

   }

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

    * @generated

    */

-  public EReference getVampireModel_Formulas()

+  public EReference getVampireModel_Tfformulas()

   {

     return (EReference)vampireModelEClass.getEStructuralFeatures().get(3);

   }

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

    * @generated

    */

-  public EReference getVampireModel_Tfformulas()

+  public EClass getVLSComment()

   {

-    return (EReference)vampireModelEClass.getEStructuralFeatures().get(4);

+    return vlsCommentEClass;

   }

 

   /**

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

    * @generated

    */

-  public EClass getVLSInclude()

+  public EAttribute getVLSComment_Comment()

   {

-    return vlsIncludeEClass;

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

   }

 

   /**

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

    * @generated

    */

-  public EAttribute getVLSInclude_FileName()

+  public EClass getVLSConfirmations()

   {

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

+    return vlsConfirmationsEClass;

   }

 

   /**

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

    * @generated

    */

-  public EReference getVLSInclude_Names()

+  public EClass getVLSFofFormula()

   {

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

+    return vlsFofFormulaEClass;

   }

 

   /**

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

    * @generated

    */

-  public EClass getVLSName()

+  public EAttribute getVLSFofFormula_Name()

   {

-    return vlsNameEClass;

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

   }

 

   /**

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

    * @generated

    */

-  public EAttribute getVLSName_Name()

+  public EAttribute getVLSFofFormula_FofRole()

   {

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

+    return (EAttribute)vlsFofFormulaEClass.getEStructuralFeatures().get(1);

   }

 

   /**

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

    * @generated

    */

-  public EClass getVLSComment()

+  public EReference getVLSFofFormula_FofFormula()

   {

-    return vlsCommentEClass;

+    return (EReference)vlsFofFormulaEClass.getEStructuralFeatures().get(2);

   }

 

   /**

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

    * @generated

    */

-  public EAttribute getVLSComment_Comment()

+  public EReference getVLSFofFormula_Annotations()

   {

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

+    return (EReference)vlsFofFormulaEClass.getEStructuralFeatures().get(3);

   }

 

   /**

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

    * @generated

    */

-  public EClass getVLSConfirmations()

+  public EClass getVLSTffFormula()

   {

-    return vlsConfirmationsEClass;

+    return vlsTffFormulaEClass;

   }

 

   /**

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

    * @generated

    */

-  public EClass getVLSSatisfiable()

+  public EAttribute getVLSTffFormula_Name()

   {

-    return vlsSatisfiableEClass;

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

   }

 

   /**

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

    * @generated

    */

-  public EClass getVLSFofFormula()

+  public EAttribute getVLSTffFormula_TffRole()

   {

-    return vlsFofFormulaEClass;

+    return (EAttribute)vlsTffFormulaEClass.getEStructuralFeatures().get(1);

   }

 

   /**

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

    * @generated

    */

-  public EAttribute getVLSFofFormula_Name()

+  public EReference getVLSTffFormula_FofFormula()

   {

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

+    return (EReference)vlsTffFormulaEClass.getEStructuralFeatures().get(2);

   }

 

   /**

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

    * @generated

    */

-  public EAttribute getVLSFofFormula_FofRole()

+  public EReference getVLSTffFormula_Annotations()

   {

-    return (EAttribute)vlsFofFormulaEClass.getEStructuralFeatures().get(1);

+    return (EReference)vlsTffFormulaEClass.getEStructuralFeatures().get(3);

   }

 

   /**

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

    * @generated

    */

-  public EReference getVLSFofFormula_FofFormula()

+  public EClass getVLSAnnotation()

   {

-    return (EReference)vlsFofFormulaEClass.getEStructuralFeatures().get(2);

+    return vlsAnnotationEClass;

   }

 

   /**

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

    * @generated

    */

-  public EReference getVLSFofFormula_Annotations()

+  public EAttribute getVLSAnnotation_Name()

   {

-    return (EReference)vlsFofFormulaEClass.getEStructuralFeatures().get(3);

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

   }

 

   /**

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

    * @generated

    */

-  public EClass getVLSTffFormula()

+  public EReference getVLSAnnotation_Followup()

   {

-    return vlsTffFormulaEClass;

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

   }

 

   /**

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

    * @generated

    */

-  public EAttribute getVLSTffFormula_Name()

+  public EReference getVLSAnnotation_Terms()

   {

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

+    return (EReference)vlsAnnotationEClass.getEStructuralFeatures().get(2);

   }

 

   /**

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

    * @generated

    */

-  public EAttribute getVLSTffFormula_FofRole()

+  public EClass getVLSTffTerm()

   {

-    return (EAttribute)vlsTffFormulaEClass.getEStructuralFeatures().get(1);

+    return vlsTffTermEClass;

   }

 

   /**

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

    * @generated

    */

-  public EReference getVLSTffFormula_FofFormula()

+  public EClass getVLSDeclaration()

   {

-    return (EReference)vlsTffFormulaEClass.getEStructuralFeatures().get(2);

+    return vlsDeclarationEClass;

   }

 

   /**

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

    * @generated

    */

-  public EReference getVLSTffFormula_Annotations()

+  public EClass getVLSOtherDeclaration()

   {

-    return (EReference)vlsTffFormulaEClass.getEStructuralFeatures().get(3);

+    return vlsOtherDeclarationEClass;

   }

 

   /**

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

    * @generated

    */

-  public EClass getVLSAnnotation()

+  public EClass getVLSVariableDeclaration()

   {

-    return vlsAnnotationEClass;

+    return vlsVariableDeclarationEClass;

   }

 

   /**

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

    * @generated

    */

-  public EAttribute getVLSAnnotation_Name()

+  public EClass getVLSTypeDef()

   {

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

+    return vlsTypeDefEClass;

   }

 

   /**

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

    * @generated

    */

-  public EReference getVLSAnnotation_Followup()

+  public EReference getVLSTypeDef_TypeSig()

   {

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

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

   }

 

   /**

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

    * @generated

    */

-  public EReference getVLSAnnotation_Terms()

+  public EReference getVLSTypeDef_MapsTo()

   {

-    return (EReference)vlsAnnotationEClass.getEStructuralFeatures().get(2);

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

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public EReference getVLSTypeDef_InitType()

+  {

+    return (EReference)vlsTypeDefEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public EReference getVLSTypeDef_NextType()

+  {

+    return (EReference)vlsTypeDefEClass.getEStructuralFeatures().get(3);

   }

 

   /**

@@ -677,6 +729,16 @@ 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;

@@ -747,6 +809,56 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

+  public EClass getVLSSatisfiable()

+  {

+    return vlsSatisfiableEClass;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public EClass getVLSWarning()

+  {

+    return vlsWarningEClass;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public EClass getVLSTrying()

+  {

+    return vlsTryingEClass;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public EAttribute getVLSTrying_Name()

+  {

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

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public EClass getVLSFiniteModel()

+  {

+    return vlsFiniteModelEClass;

+  }

+

+  /**

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

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

+   * @generated

+   */

   public EClass getVLSEquivalent()

   {

     return vlsEquivalentEClass;

@@ -1267,26 +1379,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public EClass getVLSReal()

-  {

-    return vlsRealEClass;

-  }

-

-  /**

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

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

-   * @generated

-   */

-  public EClass getVLSRational()

-  {

-    return vlsRationalEClass;

-  }

-

-  /**

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

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

-   * @generated

-   */

   public EClass getVLSDoubleQuote()

   {

     return vlsDoubleQuoteEClass;

@@ -1323,26 +1415,16 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
 

     // Create classes and their features

     vampireModelEClass = createEClass(VAMPIRE_MODEL);

-    createEReference(vampireModelEClass, VAMPIRE_MODEL__INCLUDES);

     createEReference(vampireModelEClass, VAMPIRE_MODEL__COMMENTS);

     createEReference(vampireModelEClass, VAMPIRE_MODEL__CONFIRMATIONS);

     createEReference(vampireModelEClass, VAMPIRE_MODEL__FORMULAS);

     createEReference(vampireModelEClass, VAMPIRE_MODEL__TFFORMULAS);

 

-    vlsIncludeEClass = createEClass(VLS_INCLUDE);

-    createEAttribute(vlsIncludeEClass, VLS_INCLUDE__FILE_NAME);

-    createEReference(vlsIncludeEClass, VLS_INCLUDE__NAMES);

-

-    vlsNameEClass = createEClass(VLS_NAME);

-    createEAttribute(vlsNameEClass, VLS_NAME__NAME);

-

     vlsCommentEClass = createEClass(VLS_COMMENT);

     createEAttribute(vlsCommentEClass, VLS_COMMENT__COMMENT);

 

     vlsConfirmationsEClass = createEClass(VLS_CONFIRMATIONS);

 

-    vlsSatisfiableEClass = createEClass(VLS_SATISFIABLE);

-

     vlsFofFormulaEClass = createEClass(VLS_FOF_FORMULA);

     createEAttribute(vlsFofFormulaEClass, VLS_FOF_FORMULA__NAME);

     createEAttribute(vlsFofFormulaEClass, VLS_FOF_FORMULA__FOF_ROLE);

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

     vlsTffFormulaEClass = createEClass(VLS_TFF_FORMULA);

     createEAttribute(vlsTffFormulaEClass, VLS_TFF_FORMULA__NAME);

-    createEAttribute(vlsTffFormulaEClass, VLS_TFF_FORMULA__FOF_ROLE);

+    createEAttribute(vlsTffFormulaEClass, VLS_TFF_FORMULA__TFF_ROLE);

     createEReference(vlsTffFormulaEClass, VLS_TFF_FORMULA__FOF_FORMULA);

     createEReference(vlsTffFormulaEClass, VLS_TFF_FORMULA__ANNOTATIONS);

 

@@ -1360,7 +1442,22 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     createEReference(vlsAnnotationEClass, VLS_ANNOTATION__FOLLOWUP);

     createEReference(vlsAnnotationEClass, VLS_ANNOTATION__TERMS);

 

+    vlsTffTermEClass = createEClass(VLS_TFF_TERM);

+

+    vlsDeclarationEClass = createEClass(VLS_DECLARATION);

+

+    vlsOtherDeclarationEClass = createEClass(VLS_OTHER_DECLARATION);

+

+    vlsVariableDeclarationEClass = createEClass(VLS_VARIABLE_DECLARATION);

+

+    vlsTypeDefEClass = createEClass(VLS_TYPE_DEF);

+    createEReference(vlsTypeDefEClass, VLS_TYPE_DEF__TYPE_SIG);

+    createEReference(vlsTypeDefEClass, VLS_TYPE_DEF__MAPS_TO);

+    createEReference(vlsTypeDefEClass, VLS_TYPE_DEF__INIT_TYPE);

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

@@ -1372,6 +1469,15 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     vlsDefinedTermEClass = createEClass(VLS_DEFINED_TERM);

     createEAttribute(vlsDefinedTermEClass, VLS_DEFINED_TERM__VALUE);

 

+    vlsSatisfiableEClass = createEClass(VLS_SATISFIABLE);

+

+    vlsWarningEClass = createEClass(VLS_WARNING);

+

+    vlsTryingEClass = createEClass(VLS_TRYING);

+    createEAttribute(vlsTryingEClass, VLS_TRYING__NAME);

+

+    vlsFiniteModelEClass = createEClass(VLS_FINITE_MODEL);

+

     vlsEquivalentEClass = createEClass(VLS_EQUIVALENT);

     createEReference(vlsEquivalentEClass, VLS_EQUIVALENT__LEFT);

     createEReference(vlsEquivalentEClass, VLS_EQUIVALENT__RIGHT);

@@ -1444,10 +1550,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
 

     vlsIntEClass = createEClass(VLS_INT);

 

-    vlsRealEClass = createEClass(VLS_REAL);

-

-    vlsRationalEClass = createEClass(VLS_RATIONAL);

-

     vlsDoubleQuoteEClass = createEClass(VLS_DOUBLE_QUOTE);

   }

 

@@ -1480,10 +1582,19 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     // Set bounds for type parameters

 

     // Add supertypes to classes

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

+    vlsDeclarationEClass.getESuperTypes().add(this.getVLSTffTerm());

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

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

+    vlsWarningEClass.getESuperTypes().add(this.getVLSConfirmations());

+    vlsTryingEClass.getESuperTypes().add(this.getVLSConfirmations());

+    vlsFiniteModelEClass.getESuperTypes().add(this.getVLSConfirmations());

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

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

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

@@ -1504,32 +1615,20 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     vlsFunctionEClass.getESuperTypes().add(this.getVLSTerm());

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

     vlsIntEClass.getESuperTypes().add(this.getVLSDefinedTerm());

-    vlsRealEClass.getESuperTypes().add(this.getVLSDefinedTerm());

-    vlsRationalEClass.getESuperTypes().add(this.getVLSDefinedTerm());

     vlsDoubleQuoteEClass.getESuperTypes().add(this.getVLSDefinedTerm());

 

     // Initialize classes and features; add operations and parameters

     initEClass(vampireModelEClass, VampireModel.class, "VampireModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-    initEReference(getVampireModel_Includes(), this.getVLSInclude(), null, "includes", null, 0, -1, VampireModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEReference(getVampireModel_Comments(), this.getVLSComment(), null, "comments", null, 0, -1, VampireModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEReference(getVampireModel_Confirmations(), this.getVLSConfirmations(), null, "confirmations", null, 0, -1, VampireModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEReference(getVampireModel_Formulas(), this.getVLSFofFormula(), null, "formulas", null, 0, -1, VampireModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEReference(getVampireModel_Tfformulas(), this.getVLSTffFormula(), null, "tfformulas", null, 0, -1, VampireModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-    initEClass(vlsIncludeEClass, VLSInclude.class, "VLSInclude", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-    initEAttribute(getVLSInclude_FileName(), ecorePackage.getEString(), "fileName", null, 0, 1, VLSInclude.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-    initEReference(getVLSInclude_Names(), this.getVLSName(), null, "names", null, 0, -1, VLSInclude.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-    initEClass(vlsNameEClass, VLSName.class, "VLSName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

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

-

     initEClass(vlsCommentEClass, VLSComment.class, "VLSComment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEAttribute(getVLSComment_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, VLSComment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsConfirmationsEClass, VLSConfirmations.class, "VLSConfirmations", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

-    initEClass(vlsSatisfiableEClass, VLSSatisfiable.class, "VLSSatisfiable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

     initEClass(vlsFofFormulaEClass, VLSFofFormula.class, "VLSFofFormula", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

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

     initEAttribute(getVLSFofFormula_FofRole(), ecorePackage.getEString(), "fofRole", null, 0, 1, VLSFofFormula.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

@@ -1538,8 +1637,8 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
 

     initEClass(vlsTffFormulaEClass, VLSTffFormula.class, "VLSTffFormula", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

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

-    initEAttribute(getVLSTffFormula_FofRole(), ecorePackage.getEString(), "fofRole", null, 0, 1, VLSTffFormula.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

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

+    initEAttribute(getVLSTffFormula_TffRole(), ecorePackage.getEString(), "tffRole", null, 0, 1, VLSTffFormula.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getVLSTffFormula_FofFormula(), this.getVLSTffTerm(), null, "fofFormula", null, 0, 1, VLSTffFormula.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEReference(getVLSTffFormula_Annotations(), this.getVLSAnnotation(), null, "annotations", null, 0, 1, VLSTffFormula.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsAnnotationEClass, VLSAnnotation.class, "VLSAnnotation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

@@ -1547,7 +1646,22 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     initEReference(getVLSAnnotation_Followup(), this.getVLSAnnotation(), null, "followup", null, 0, 1, VLSAnnotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

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

 

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

+

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

+

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

+

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

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

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

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

@@ -1559,6 +1673,15 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     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);

 

+    initEClass(vlsSatisfiableEClass, VLSSatisfiable.class, "VLSSatisfiable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+    initEClass(vlsWarningEClass, VLSWarning.class, "VLSWarning", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+    initEClass(vlsTryingEClass, VLSTrying.class, "VLSTrying", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

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

+

+    initEClass(vlsFiniteModelEClass, VLSFiniteModel.class, "VLSFiniteModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

     initEClass(vlsEquivalentEClass, VLSEquivalent.class, "VLSEquivalent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEReference(getVLSEquivalent_Left(), this.getVLSTerm(), null, "left", null, 0, 1, VLSEquivalent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEReference(getVLSEquivalent_Right(), this.getVLSTerm(), null, "right", null, 0, 1, VLSEquivalent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

@@ -1592,11 +1715,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.getVLSVariable(), 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.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_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.getVLSVariable(), 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.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_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);

@@ -1631,10 +1754,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
 

     initEClass(vlsIntEClass, VLSInt.class, "VLSInt", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

-    initEClass(vlsRealEClass, VLSReal.class, "VLSReal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

-    initEClass(vlsRationalEClass, VLSRational.class, "VLSRational", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-

     initEClass(vlsDoubleQuoteEClass, VLSDoubleQuote.class, "VLSDoubleQuote", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

     // Create resource

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireModelImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireModelImpl.java
index e0dcd099..1e26c760 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireModelImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireModelImpl.java
@@ -6,7 +6,6 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment;

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

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

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

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

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

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

@@ -33,7 +32,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * The following features are implemented:

  * </p>

  * <ul>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireModelImpl#getIncludes <em>Includes</em>}</li>

  *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireModelImpl#getComments <em>Comments</em>}</li>

  *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireModelImpl#getConfirmations <em>Confirmations</em>}</li>

  *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireModelImpl#getFormulas <em>Formulas</em>}</li>

@@ -45,16 +43,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
 public class VampireModelImpl extends MinimalEObjectImpl.Container implements VampireModel

 {

   /**

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

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

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

-   * @see #getIncludes()

-   * @generated

-   * @ordered

-   */

-  protected EList<VLSInclude> includes;

-

-  /**

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

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

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

@@ -120,20 +108,6 @@ public class VampireModelImpl extends MinimalEObjectImpl.Container implements Va
    * <!-- end-user-doc -->

    * @generated

    */

-  public EList<VLSInclude> getIncludes()

-  {

-    if (includes == null)

-    {

-      includes = new EObjectContainmentEList<VLSInclude>(VLSInclude.class, this, VampireLanguagePackage.VAMPIRE_MODEL__INCLUDES);

-    }

-    return includes;

-  }

-

-  /**

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

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

-   * @generated

-   */

   public EList<VLSComment> getComments()

   {

     if (comments == null)

@@ -195,8 +169,6 @@ public class VampireModelImpl extends MinimalEObjectImpl.Container implements Va
   {

     switch (featureID)

     {

-      case VampireLanguagePackage.VAMPIRE_MODEL__INCLUDES:

-        return ((InternalEList<?>)getIncludes()).basicRemove(otherEnd, msgs);

       case VampireLanguagePackage.VAMPIRE_MODEL__COMMENTS:

         return ((InternalEList<?>)getComments()).basicRemove(otherEnd, msgs);

       case VampireLanguagePackage.VAMPIRE_MODEL__CONFIRMATIONS:

@@ -219,8 +191,6 @@ public class VampireModelImpl extends MinimalEObjectImpl.Container implements Va
   {

     switch (featureID)

     {

-      case VampireLanguagePackage.VAMPIRE_MODEL__INCLUDES:

-        return getIncludes();

       case VampireLanguagePackage.VAMPIRE_MODEL__COMMENTS:

         return getComments();

       case VampireLanguagePackage.VAMPIRE_MODEL__CONFIRMATIONS:

@@ -244,10 +214,6 @@ public class VampireModelImpl extends MinimalEObjectImpl.Container implements Va
   {

     switch (featureID)

     {

-      case VampireLanguagePackage.VAMPIRE_MODEL__INCLUDES:

-        getIncludes().clear();

-        getIncludes().addAll((Collection<? extends VLSInclude>)newValue);

-        return;

       case VampireLanguagePackage.VAMPIRE_MODEL__COMMENTS:

         getComments().clear();

         getComments().addAll((Collection<? extends VLSComment>)newValue);

@@ -278,9 +244,6 @@ public class VampireModelImpl extends MinimalEObjectImpl.Container implements Va
   {

     switch (featureID)

     {

-      case VampireLanguagePackage.VAMPIRE_MODEL__INCLUDES:

-        getIncludes().clear();

-        return;

       case VampireLanguagePackage.VAMPIRE_MODEL__COMMENTS:

         getComments().clear();

         return;

@@ -307,8 +270,6 @@ public class VampireModelImpl extends MinimalEObjectImpl.Container implements Va
   {

     switch (featureID)

     {

-      case VampireLanguagePackage.VAMPIRE_MODEL__INCLUDES:

-        return includes != null && !includes.isEmpty();

       case VampireLanguagePackage.VAMPIRE_MODEL__COMMENTS:

         return comments != null && !comments.isEmpty();

       case VampireLanguagePackage.VAMPIRE_MODEL__CONFIRMATIONS:

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 1d9a6b22..92b5a89d 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
@@ -81,16 +81,6 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl
         return createVampireModelAdapter();

       }

       @Override

-      public Adapter caseVLSInclude(VLSInclude object)

-      {

-        return createVLSIncludeAdapter();

-      }

-      @Override

-      public Adapter caseVLSName(VLSName object)

-      {

-        return createVLSNameAdapter();

-      }

-      @Override

       public Adapter caseVLSComment(VLSComment object)

       {

         return createVLSCommentAdapter();

@@ -101,11 +91,6 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl
         return createVLSConfirmationsAdapter();

       }

       @Override

-      public Adapter caseVLSSatisfiable(VLSSatisfiable object)

-      {

-        return createVLSSatisfiableAdapter();

-      }

-      @Override

       public Adapter caseVLSFofFormula(VLSFofFormula object)

       {

         return createVLSFofFormulaAdapter();

@@ -121,6 +106,31 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl
         return createVLSAnnotationAdapter();

       }

       @Override

+      public Adapter caseVLSTffTerm(VLSTffTerm object)

+      {

+        return createVLSTffTermAdapter();

+      }

+      @Override

+      public Adapter caseVLSDeclaration(VLSDeclaration object)

+      {

+        return createVLSDeclarationAdapter();

+      }

+      @Override

+      public Adapter caseVLSOtherDeclaration(VLSOtherDeclaration object)

+      {

+        return createVLSOtherDeclarationAdapter();

+      }

+      @Override

+      public Adapter caseVLSVariableDeclaration(VLSVariableDeclaration object)

+      {

+        return createVLSVariableDeclarationAdapter();

+      }

+      @Override

+      public Adapter caseVLSTypeDef(VLSTypeDef object)

+      {

+        return createVLSTypeDefAdapter();

+      }

+      @Override

       public Adapter caseVLSTerm(VLSTerm object)

       {

         return createVLSTermAdapter();

@@ -141,6 +151,26 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl
         return createVLSDefinedTermAdapter();

       }

       @Override

+      public Adapter caseVLSSatisfiable(VLSSatisfiable object)

+      {

+        return createVLSSatisfiableAdapter();

+      }

+      @Override

+      public Adapter caseVLSWarning(VLSWarning object)

+      {

+        return createVLSWarningAdapter();

+      }

+      @Override

+      public Adapter caseVLSTrying(VLSTrying object)

+      {

+        return createVLSTryingAdapter();

+      }

+      @Override

+      public Adapter caseVLSFiniteModel(VLSFiniteModel object)

+      {

+        return createVLSFiniteModelAdapter();

+      }

+      @Override

       public Adapter caseVLSEquivalent(VLSEquivalent object)

       {

         return createVLSEquivalentAdapter();

@@ -241,16 +271,6 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl
         return createVLSIntAdapter();

       }

       @Override

-      public Adapter caseVLSReal(VLSReal object)

-      {

-        return createVLSRealAdapter();

-      }

-      @Override

-      public Adapter caseVLSRational(VLSRational object)

-      {

-        return createVLSRationalAdapter();

-      }

-      @Override

       public Adapter caseVLSDoubleQuote(VLSDoubleQuote object)

       {

         return createVLSDoubleQuoteAdapter();

@@ -293,121 +313,151 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl
   }

 

   /**

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

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment <em>VLS Comment</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.VLSInclude

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

    * @generated

    */

-  public Adapter createVLSIncludeAdapter()

+  public Adapter createVLSCommentAdapter()

   {

     return null;

   }

 

   /**

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

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConfirmations <em>VLS Confirmations</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.VLSName

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

    * @generated

    */

-  public Adapter createVLSNameAdapter()

+  public Adapter createVLSConfirmationsAdapter()

   {

     return null;

   }

 

   /**

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

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula <em>VLS Fof Formula</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.VLSComment

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

    * @generated

    */

-  public Adapter createVLSCommentAdapter()

+  public Adapter createVLSFofFormulaAdapter()

   {

     return null;

   }

 

   /**

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

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula <em>VLS Tff Formula</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.VLSConfirmations

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

    * @generated

    */

-  public Adapter createVLSConfirmationsAdapter()

+  public Adapter createVLSTffFormulaAdapter()

   {

     return null;

   }

 

   /**

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

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation <em>VLS Annotation</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.VLSSatisfiable

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

    * @generated

    */

-  public Adapter createVLSSatisfiableAdapter()

+  public Adapter createVLSAnnotationAdapter()

   {

     return null;

   }

 

   /**

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

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffTerm <em>VLS Tff 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.VLSFofFormula

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

    * @generated

    */

-  public Adapter createVLSFofFormulaAdapter()

+  public Adapter createVLSTffTermAdapter()

   {

     return null;

   }

 

   /**

-   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula <em>VLS Tff Formula</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.VLSTffFormula

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

    * @generated

    */

-  public Adapter createVLSTffFormulaAdapter()

+  public Adapter createVLSDeclarationAdapter()

   {

     return null;

   }

 

   /**

-   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation <em>VLS Annotation</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.VLSAnnotation

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

    * @generated

    */

-  public Adapter createVLSAnnotationAdapter()

+  public Adapter createVLSOtherDeclarationAdapter()

+  {

+    return null;

+  }

+

+  /**

+   * 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.VLSVariableDeclaration

+   * @generated

+   */

+  public Adapter createVLSVariableDeclarationAdapter()

+  {

+    return null;

+  }

+

+  /**

+   * 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.VLSTypeDef

+   * @generated

+   */

+  public Adapter createVLSTypeDefAdapter()

   {

     return null;

   }

@@ -473,6 +523,66 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl
   }

 

   /**

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSSatisfiable <em>VLS Satisfiable</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.VLSSatisfiable

+   * @generated

+   */

+  public Adapter createVLSSatisfiableAdapter()

+  {

+    return null;

+  }

+

+  /**

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSWarning <em>VLS Warning</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.VLSWarning

+   * @generated

+   */

+  public Adapter createVLSWarningAdapter()

+  {

+    return null;

+  }

+

+  /**

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTrying <em>VLS Trying</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.VLSTrying

+   * @generated

+   */

+  public Adapter createVLSTryingAdapter()

+  {

+    return null;

+  }

+

+  /**

+   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFiniteModel <em>VLS Finite Model</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.VLSFiniteModel

+   * @generated

+   */

+  public Adapter createVLSFiniteModelAdapter()

+  {

+    return null;

+  }

+

+  /**

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

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

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

@@ -773,36 +883,6 @@ public class VampireLanguageAdapterFactory extends AdapterFactoryImpl
   }

 

   /**

-   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSReal <em>VLS Real</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.VLSReal

-   * @generated

-   */

-  public Adapter createVLSRealAdapter()

-  {

-    return null;

-  }

-

-  /**

-   * Creates a new adapter for an object of class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSRational <em>VLS Rational</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.VLSRational

-   * @generated

-   */

-  public Adapter createVLSRationalAdapter()

-  {

-    return null;

-  }

-

-  /**

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

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

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

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 3b7106f8..e4aae7f8 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
@@ -80,20 +80,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         if (result == null) result = defaultCase(theEObject);

         return result;

       }

-      case VampireLanguagePackage.VLS_INCLUDE:

-      {

-        VLSInclude vlsInclude = (VLSInclude)theEObject;

-        T result = caseVLSInclude(vlsInclude);

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

-        return result;

-      }

-      case VampireLanguagePackage.VLS_NAME:

-      {

-        VLSName vlsName = (VLSName)theEObject;

-        T result = caseVLSName(vlsName);

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

-        return result;

-      }

       case VampireLanguagePackage.VLS_COMMENT:

       {

         VLSComment vlsComment = (VLSComment)theEObject;

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

         return result;

       }

-      case VampireLanguagePackage.VLS_SATISFIABLE:

-      {

-        VLSSatisfiable vlsSatisfiable = (VLSSatisfiable)theEObject;

-        T result = caseVLSSatisfiable(vlsSatisfiable);

-        if (result == null) result = caseVLSConfirmations(vlsSatisfiable);

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

-        return result;

-      }

       case VampireLanguagePackage.VLS_FOF_FORMULA:

       {

         VLSFofFormula vlsFofFormula = (VLSFofFormula)theEObject;

@@ -137,10 +115,53 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         if (result == null) result = defaultCase(theEObject);

         return result;

       }

+      case VampireLanguagePackage.VLS_TFF_TERM:

+      {

+        VLSTffTerm vlsTffTerm = (VLSTffTerm)theEObject;

+        T result = caseVLSTffTerm(vlsTffTerm);

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

+        return result;

+      }

+      case VampireLanguagePackage.VLS_DECLARATION:

+      {

+        VLSDeclaration vlsDeclaration = (VLSDeclaration)theEObject;

+        T result = caseVLSDeclaration(vlsDeclaration);

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

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

+        return result;

+      }

+      case VampireLanguagePackage.VLS_OTHER_DECLARATION:

+      {

+        VLSOtherDeclaration vlsOtherDeclaration = (VLSOtherDeclaration)theEObject;

+        T result = caseVLSOtherDeclaration(vlsOtherDeclaration);

+        if (result == null) result = caseVLSDeclaration(vlsOtherDeclaration);

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

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

+        return result;

+      }

+      case VampireLanguagePackage.VLS_VARIABLE_DECLARATION:

+      {

+        VLSVariableDeclaration vlsVariableDeclaration = (VLSVariableDeclaration)theEObject;

+        T result = caseVLSVariableDeclaration(vlsVariableDeclaration);

+        if (result == null) result = caseVLSDeclaration(vlsVariableDeclaration);

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

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

+        return result;

+      }

+      case VampireLanguagePackage.VLS_TYPE_DEF:

+      {

+        VLSTypeDef vlsTypeDef = (VLSTypeDef)theEObject;

+        T result = caseVLSTypeDef(vlsTypeDef);

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

+        return result;

+      }

       case VampireLanguagePackage.VLS_TERM:

       {

         VLSTerm vlsTerm = (VLSTerm)theEObject;

         T result = caseVLSTerm(vlsTerm);

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

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

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

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

         return result;

       }

@@ -148,7 +169,11 @@ public class VampireLanguageSwitch<T> extends Switch<T>
       {

         VLSVariable vlsVariable = (VLSVariable)theEObject;

         T result = caseVLSVariable(vlsVariable);

+        if (result == null) result = caseVLSVariableDeclaration(vlsVariable);

         if (result == null) result = caseVLSTerm(vlsVariable);

+        if (result == null) result = caseVLSOtherDeclaration(vlsVariable);

+        if (result == null) result = caseVLSDeclaration(vlsVariable);

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

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

         return result;

       }

@@ -157,6 +182,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSFunctionAsTerm vlsFunctionAsTerm = (VLSFunctionAsTerm)theEObject;

         T result = caseVLSFunctionAsTerm(vlsFunctionAsTerm);

         if (result == null) result = caseVLSTerm(vlsFunctionAsTerm);

+        if (result == null) result = caseVLSOtherDeclaration(vlsFunctionAsTerm);

+        if (result == null) result = caseVLSDeclaration(vlsFunctionAsTerm);

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

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

         return result;

       }

@@ -165,6 +193,41 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSDefinedTerm vlsDefinedTerm = (VLSDefinedTerm)theEObject;

         T result = caseVLSDefinedTerm(vlsDefinedTerm);

         if (result == null) result = caseVLSTerm(vlsDefinedTerm);

+        if (result == null) result = caseVLSOtherDeclaration(vlsDefinedTerm);

+        if (result == null) result = caseVLSDeclaration(vlsDefinedTerm);

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

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

+        return result;

+      }

+      case VampireLanguagePackage.VLS_SATISFIABLE:

+      {

+        VLSSatisfiable vlsSatisfiable = (VLSSatisfiable)theEObject;

+        T result = caseVLSSatisfiable(vlsSatisfiable);

+        if (result == null) result = caseVLSConfirmations(vlsSatisfiable);

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

+        return result;

+      }

+      case VampireLanguagePackage.VLS_WARNING:

+      {

+        VLSWarning vlsWarning = (VLSWarning)theEObject;

+        T result = caseVLSWarning(vlsWarning);

+        if (result == null) result = caseVLSConfirmations(vlsWarning);

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

+        return result;

+      }

+      case VampireLanguagePackage.VLS_TRYING:

+      {

+        VLSTrying vlsTrying = (VLSTrying)theEObject;

+        T result = caseVLSTrying(vlsTrying);

+        if (result == null) result = caseVLSConfirmations(vlsTrying);

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

+        return result;

+      }

+      case VampireLanguagePackage.VLS_FINITE_MODEL:

+      {

+        VLSFiniteModel vlsFiniteModel = (VLSFiniteModel)theEObject;

+        T result = caseVLSFiniteModel(vlsFiniteModel);

+        if (result == null) result = caseVLSConfirmations(vlsFiniteModel);

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

         return result;

       }

@@ -173,6 +236,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSEquivalent vlsEquivalent = (VLSEquivalent)theEObject;

         T result = caseVLSEquivalent(vlsEquivalent);

         if (result == null) result = caseVLSTerm(vlsEquivalent);

+        if (result == null) result = caseVLSOtherDeclaration(vlsEquivalent);

+        if (result == null) result = caseVLSDeclaration(vlsEquivalent);

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

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

         return result;

       }

@@ -181,6 +247,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSImplies vlsImplies = (VLSImplies)theEObject;

         T result = caseVLSImplies(vlsImplies);

         if (result == null) result = caseVLSTerm(vlsImplies);

+        if (result == null) result = caseVLSOtherDeclaration(vlsImplies);

+        if (result == null) result = caseVLSDeclaration(vlsImplies);

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

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

         return result;

       }

@@ -189,6 +258,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSRevImplies vlsRevImplies = (VLSRevImplies)theEObject;

         T result = caseVLSRevImplies(vlsRevImplies);

         if (result == null) result = caseVLSTerm(vlsRevImplies);

+        if (result == null) result = caseVLSOtherDeclaration(vlsRevImplies);

+        if (result == null) result = caseVLSDeclaration(vlsRevImplies);

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

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

         return result;

       }

@@ -197,6 +269,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSXnor vlsXnor = (VLSXnor)theEObject;

         T result = caseVLSXnor(vlsXnor);

         if (result == null) result = caseVLSTerm(vlsXnor);

+        if (result == null) result = caseVLSOtherDeclaration(vlsXnor);

+        if (result == null) result = caseVLSDeclaration(vlsXnor);

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

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

         return result;

       }

@@ -205,6 +280,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSNor vlsNor = (VLSNor)theEObject;

         T result = caseVLSNor(vlsNor);

         if (result == null) result = caseVLSTerm(vlsNor);

+        if (result == null) result = caseVLSOtherDeclaration(vlsNor);

+        if (result == null) result = caseVLSDeclaration(vlsNor);

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

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

         return result;

       }

@@ -213,6 +291,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSNand vlsNand = (VLSNand)theEObject;

         T result = caseVLSNand(vlsNand);

         if (result == null) result = caseVLSTerm(vlsNand);

+        if (result == null) result = caseVLSOtherDeclaration(vlsNand);

+        if (result == null) result = caseVLSDeclaration(vlsNand);

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

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

         return result;

       }

@@ -221,6 +302,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSAnd vlsAnd = (VLSAnd)theEObject;

         T result = caseVLSAnd(vlsAnd);

         if (result == null) result = caseVLSTerm(vlsAnd);

+        if (result == null) result = caseVLSOtherDeclaration(vlsAnd);

+        if (result == null) result = caseVLSDeclaration(vlsAnd);

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

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

         return result;

       }

@@ -229,6 +313,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSOr vlsOr = (VLSOr)theEObject;

         T result = caseVLSOr(vlsOr);

         if (result == null) result = caseVLSTerm(vlsOr);

+        if (result == null) result = caseVLSOtherDeclaration(vlsOr);

+        if (result == null) result = caseVLSDeclaration(vlsOr);

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

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

         return result;

       }

@@ -237,6 +324,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSUniversalQuantifier vlsUniversalQuantifier = (VLSUniversalQuantifier)theEObject;

         T result = caseVLSUniversalQuantifier(vlsUniversalQuantifier);

         if (result == null) result = caseVLSTerm(vlsUniversalQuantifier);

+        if (result == null) result = caseVLSOtherDeclaration(vlsUniversalQuantifier);

+        if (result == null) result = caseVLSDeclaration(vlsUniversalQuantifier);

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

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

         return result;

       }

@@ -245,6 +335,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSExistentialQuantifier vlsExistentialQuantifier = (VLSExistentialQuantifier)theEObject;

         T result = caseVLSExistentialQuantifier(vlsExistentialQuantifier);

         if (result == null) result = caseVLSTerm(vlsExistentialQuantifier);

+        if (result == null) result = caseVLSOtherDeclaration(vlsExistentialQuantifier);

+        if (result == null) result = caseVLSDeclaration(vlsExistentialQuantifier);

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

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

         return result;

       }

@@ -253,6 +346,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSUnaryNegation vlsUnaryNegation = (VLSUnaryNegation)theEObject;

         T result = caseVLSUnaryNegation(vlsUnaryNegation);

         if (result == null) result = caseVLSTerm(vlsUnaryNegation);

+        if (result == null) result = caseVLSOtherDeclaration(vlsUnaryNegation);

+        if (result == null) result = caseVLSDeclaration(vlsUnaryNegation);

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

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

         return result;

       }

@@ -261,6 +357,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSInequality vlsInequality = (VLSInequality)theEObject;

         T result = caseVLSInequality(vlsInequality);

         if (result == null) result = caseVLSTerm(vlsInequality);

+        if (result == null) result = caseVLSOtherDeclaration(vlsInequality);

+        if (result == null) result = caseVLSDeclaration(vlsInequality);

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

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

         return result;

       }

@@ -269,6 +368,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSEquality vlsEquality = (VLSEquality)theEObject;

         T result = caseVLSEquality(vlsEquality);

         if (result == null) result = caseVLSTerm(vlsEquality);

+        if (result == null) result = caseVLSOtherDeclaration(vlsEquality);

+        if (result == null) result = caseVLSDeclaration(vlsEquality);

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

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

         return result;

       }

@@ -277,6 +379,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSAssignment vlsAssignment = (VLSAssignment)theEObject;

         T result = caseVLSAssignment(vlsAssignment);

         if (result == null) result = caseVLSTerm(vlsAssignment);

+        if (result == null) result = caseVLSOtherDeclaration(vlsAssignment);

+        if (result == null) result = caseVLSDeclaration(vlsAssignment);

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

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

         return result;

       }

@@ -285,6 +390,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSConstant vlsConstant = (VLSConstant)theEObject;

         T result = caseVLSConstant(vlsConstant);

         if (result == null) result = caseVLSTerm(vlsConstant);

+        if (result == null) result = caseVLSOtherDeclaration(vlsConstant);

+        if (result == null) result = caseVLSDeclaration(vlsConstant);

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

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

         return result;

       }

@@ -293,6 +401,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSTrue vlsTrue = (VLSTrue)theEObject;

         T result = caseVLSTrue(vlsTrue);

         if (result == null) result = caseVLSTerm(vlsTrue);

+        if (result == null) result = caseVLSOtherDeclaration(vlsTrue);

+        if (result == null) result = caseVLSDeclaration(vlsTrue);

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

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

         return result;

       }

@@ -301,6 +412,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSFalse vlsFalse = (VLSFalse)theEObject;

         T result = caseVLSFalse(vlsFalse);

         if (result == null) result = caseVLSTerm(vlsFalse);

+        if (result == null) result = caseVLSOtherDeclaration(vlsFalse);

+        if (result == null) result = caseVLSDeclaration(vlsFalse);

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

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

         return result;

       }

@@ -309,6 +423,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSFunction vlsFunction = (VLSFunction)theEObject;

         T result = caseVLSFunction(vlsFunction);

         if (result == null) result = caseVLSTerm(vlsFunction);

+        if (result == null) result = caseVLSOtherDeclaration(vlsFunction);

+        if (result == null) result = caseVLSDeclaration(vlsFunction);

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

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

         return result;

       }

@@ -317,6 +434,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSLess vlsLess = (VLSLess)theEObject;

         T result = caseVLSLess(vlsLess);

         if (result == null) result = caseVLSTerm(vlsLess);

+        if (result == null) result = caseVLSOtherDeclaration(vlsLess);

+        if (result == null) result = caseVLSDeclaration(vlsLess);

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

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

         return result;

       }

@@ -326,24 +446,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         T result = caseVLSInt(vlsInt);

         if (result == null) result = caseVLSDefinedTerm(vlsInt);

         if (result == null) result = caseVLSTerm(vlsInt);

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

-        return result;

-      }

-      case VampireLanguagePackage.VLS_REAL:

-      {

-        VLSReal vlsReal = (VLSReal)theEObject;

-        T result = caseVLSReal(vlsReal);

-        if (result == null) result = caseVLSDefinedTerm(vlsReal);

-        if (result == null) result = caseVLSTerm(vlsReal);

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

-        return result;

-      }

-      case VampireLanguagePackage.VLS_RATIONAL:

-      {

-        VLSRational vlsRational = (VLSRational)theEObject;

-        T result = caseVLSRational(vlsRational);

-        if (result == null) result = caseVLSDefinedTerm(vlsRational);

-        if (result == null) result = caseVLSTerm(vlsRational);

+        if (result == null) result = caseVLSOtherDeclaration(vlsInt);

+        if (result == null) result = caseVLSDeclaration(vlsInt);

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

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

         return result;

       }

@@ -353,6 +458,9 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         T result = caseVLSDoubleQuote(vlsDoubleQuote);

         if (result == null) result = caseVLSDefinedTerm(vlsDoubleQuote);

         if (result == null) result = caseVLSTerm(vlsDoubleQuote);

+        if (result == null) result = caseVLSOtherDeclaration(vlsDoubleQuote);

+        if (result == null) result = caseVLSDeclaration(vlsDoubleQuote);

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

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

         return result;

       }

@@ -377,129 +485,161 @@ public class VampireLanguageSwitch<T> extends Switch<T>
   }

 

   /**

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

+   * Returns the result of interpreting the object as an instance of '<em>VLS Comment</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 Include</em>'.

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

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

    * @generated

    */

-  public T caseVLSInclude(VLSInclude object)

+  public T caseVLSComment(VLSComment object)

   {

     return null;

   }

 

   /**

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

+   * Returns the result of interpreting the object as an instance of '<em>VLS Confirmations</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 Name</em>'.

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

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

    * @generated

    */

-  public T caseVLSName(VLSName object)

+  public T caseVLSConfirmations(VLSConfirmations object)

   {

     return null;

   }

 

   /**

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

+   * Returns the result of interpreting the object as an instance of '<em>VLS Fof Formula</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 Comment</em>'.

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

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

    * @generated

    */

-  public T caseVLSComment(VLSComment object)

+  public T caseVLSFofFormula(VLSFofFormula object)

   {

     return null;

   }

 

   /**

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

+   * Returns the result of interpreting the object as an instance of '<em>VLS Tff Formula</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 Confirmations</em>'.

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

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

    * @generated

    */

-  public T caseVLSConfirmations(VLSConfirmations object)

+  public T caseVLSTffFormula(VLSTffFormula object)

   {

     return null;

   }

 

   /**

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

+   * Returns the result of interpreting the object as an instance of '<em>VLS Annotation</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 Satisfiable</em>'.

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

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

    * @generated

    */

-  public T caseVLSSatisfiable(VLSSatisfiable object)

+  public T caseVLSAnnotation(VLSAnnotation object)

   {

     return null;

   }

 

   /**

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

+   * Returns the result of interpreting the object as an instance of '<em>VLS Tff 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 Fof Formula</em>'.

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

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

    * @generated

    */

-  public T caseVLSFofFormula(VLSFofFormula object)

+  public T caseVLSTffTerm(VLSTffTerm object)

   {

     return null;

   }

 

   /**

-   * Returns the result of interpreting the object as an instance of '<em>VLS Tff Formula</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 Tff Formula</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 caseVLSTffFormula(VLSTffFormula object)

+  public T caseVLSDeclaration(VLSDeclaration object)

   {

     return null;

   }

 

   /**

-   * Returns the result of interpreting the object as an instance of '<em>VLS Annotation</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 Annotation</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 caseVLSAnnotation(VLSAnnotation object)

+  public T caseVLSOtherDeclaration(VLSOtherDeclaration object)

+  {

+    return null;

+  }

+

+  /**

+   * 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 Variable Declaration</em>'.

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

+   * @generated

+   */

+  public T caseVLSVariableDeclaration(VLSVariableDeclaration object)

+  {

+    return null;

+  }

+

+  /**

+   * 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 Type Def</em>'.

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

+   * @generated

+   */

+  public T caseVLSTypeDef(VLSTypeDef object)

   {

     return null;

   }

@@ -569,6 +709,70 @@ public class VampireLanguageSwitch<T> extends Switch<T>
   }

 

   /**

+   * Returns the result of interpreting the object as an instance of '<em>VLS Satisfiable</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 Satisfiable</em>'.

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

+   * @generated

+   */

+  public T caseVLSSatisfiable(VLSSatisfiable object)

+  {

+    return null;

+  }

+

+  /**

+   * Returns the result of interpreting the object as an instance of '<em>VLS Warning</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 Warning</em>'.

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

+   * @generated

+   */

+  public T caseVLSWarning(VLSWarning object)

+  {

+    return null;

+  }

+

+  /**

+   * Returns the result of interpreting the object as an instance of '<em>VLS Trying</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 Trying</em>'.

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

+   * @generated

+   */

+  public T caseVLSTrying(VLSTrying object)

+  {

+    return null;

+  }

+

+  /**

+   * Returns the result of interpreting the object as an instance of '<em>VLS Finite Model</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 Finite Model</em>'.

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

+   * @generated

+   */

+  public T caseVLSFiniteModel(VLSFiniteModel object)

+  {

+    return null;

+  }

+

+  /**

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

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

    * This implementation returns null;

@@ -889,38 +1093,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
   }

 

   /**

-   * Returns the result of interpreting the object as an instance of '<em>VLS Real</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 Real</em>'.

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

-   * @generated

-   */

-  public T caseVLSReal(VLSReal object)

-  {

-    return null;

-  }

-

-  /**

-   * Returns the result of interpreting the object as an instance of '<em>VLS Rational</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 Rational</em>'.

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

-   * @generated

-   */

-  public T caseVLSRational(VLSRational object)

-  {

-    return null;

-  }

-

-  /**

    * Returns the result of interpreting the object as an instance of '<em>VLS Double Quote</em>'.

    * <!-- begin-user-doc -->

    * This implementation returns null;