8 files changed, 548 insertions, 124 deletions

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 d1f20508..83941c8b 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
@@ -9,6 +9,12 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage;
  * 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#getComment <em>Comment</em>}</li>

+ * </ul>

  *

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

  * @model

@@ -16,4 +22,30 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage;
  */

 public interface VLSTerm extends VLSTffTerm

 {

+  /**

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

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

+   * <p>

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

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

+   * </p>

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

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

+   * @see #setComment(String)

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

+   * @model

+   * @generated

+   */

+  String getComment();

+

+  /**

+   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm#getComment <em>Comment</em>}' attribute.

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

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

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

+   * @see #getComment()

+   * @generated

+   */

+  void setComment(String value);

+

 } // VLSTerm

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 171bb39e..a137054e 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
@@ -87,6 +87,15 @@ public interface VampireLanguageFactory extends EFactory
   VLSTffTerm createVLSTffTerm();

 

   /**

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

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

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

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

+   * @generated

+   */

+  VLSTerm createVLSTerm();

+

+  /**

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

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

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

@@ -123,15 +132,6 @@ public interface VampireLanguageFactory extends EFactory
   VLSTypeDef createVLSTypeDef();

 

   /**

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

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

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

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

-   * @generated

-   */

-  VLSTerm createVLSTerm();

-

-  /**

    * Returns a new object of class '<em>VLS Variable</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 7c917251..43327c64 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
@@ -335,6 +335,34 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_TFF_TERM_FEATURE_COUNT = 0;

 

   /**

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

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

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

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

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

+   * @generated

+   */

+  int VLS_TERM = 7;

+

+  /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_TERM__COMMENT = VLS_TFF_TERM_FEATURE_COUNT + 0;

+

+  /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_TERM_FEATURE_COUNT = VLS_TFF_TERM_FEATURE_COUNT + 1;

+

+  /**

    * 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 -->

@@ -342,7 +370,7 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSDeclaration()

    * @generated

    */

-  int VLS_DECLARATION = 7;

+  int VLS_DECLARATION = 8;

 

   /**

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

@@ -370,7 +398,7 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSOtherDeclaration()

    * @generated

    */

-  int VLS_OTHER_DECLARATION = 8;

+  int VLS_OTHER_DECLARATION = 9;

 

   /**

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

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

    * @generated

    */

-  int VLS_VARIABLE_DECLARATION = 9;

+  int VLS_VARIABLE_DECLARATION = 10;

 

   /**

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

@@ -444,7 +472,7 @@ public interface VampireLanguagePackage extends EPackage
    * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VampireLanguagePackageImpl#getVLSTypeDef()

    * @generated

    */

-  int VLS_TYPE_DEF = 10;

+  int VLS_TYPE_DEF = 11;

 

   /**

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

@@ -492,33 +520,23 @@ public interface VampireLanguagePackage extends EPackage
   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.

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

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

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

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

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

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

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

    * @generated

    */

-  int VLS_TERM = 11;

+  int VLS_VARIABLE = 12;

 

   /**

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

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

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

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

    * @generated

    * @ordered

    */

-  int VLS_TERM_FEATURE_COUNT = VLS_TFF_TERM_FEATURE_COUNT + 0;

-

-  /**

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

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

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

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

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

-   * @generated

-   */

-  int VLS_VARIABLE = 12;

+  int VLS_VARIABLE__COMMENT = VLS_TERM__COMMENT;

 

   /**

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

@@ -549,6 +567,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_FUNCTION_AS_TERM = 13;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_FUNCTION_AS_TERM__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -586,6 +613,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_DEFINED_TERM = 14;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_DEFINED_TERM__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -699,6 +735,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_EQUIVALENT = 19;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_EQUIVALENT__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -736,6 +781,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_IMPLIES = 20;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_IMPLIES__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -773,6 +827,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_REV_IMPLIES = 21;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_REV_IMPLIES__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -810,6 +873,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_XNOR = 22;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_XNOR__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -847,6 +919,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_NOR = 23;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_NOR__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -884,6 +965,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_NAND = 24;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_NAND__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -921,6 +1011,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_AND = 25;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_AND__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -958,6 +1057,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_OR = 26;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_OR__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -995,6 +1103,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_UNIVERSAL_QUANTIFIER = 27;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_UNIVERSAL_QUANTIFIER__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -1032,6 +1149,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_EXISTENTIAL_QUANTIFIER = 28;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_EXISTENTIAL_QUANTIFIER__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -1069,6 +1195,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_UNARY_NEGATION = 29;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_UNARY_NEGATION__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -1097,6 +1232,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_INEQUALITY = 30;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_INEQUALITY__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -1134,6 +1278,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_EQUALITY = 31;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_EQUALITY__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -1171,6 +1324,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_ASSIGNMENT = 32;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_ASSIGNMENT__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -1208,6 +1370,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_CONSTANT = 33;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_CONSTANT__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -1236,6 +1407,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_TRUE = 34;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_TRUE__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -1255,6 +1435,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_FALSE = 35;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_FALSE__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -1274,6 +1463,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_FUNCTION = 36;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_FUNCTION__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -1311,6 +1509,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_LESS = 37;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_LESS__COMMENT = VLS_TERM__COMMENT;

+

+  /**

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

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

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

@@ -1348,6 +1555,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_INT = 38;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_INT__COMMENT = VLS_DEFINED_TERM__COMMENT;

+

+  /**

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

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

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

@@ -1376,6 +1592,15 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_DOUBLE_QUOTE = 39;

 

   /**

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

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

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

+   * @generated

+   * @ordered

+   */

+  int VLS_DOUBLE_QUOTE__COMMENT = VLS_DEFINED_TERM__COMMENT;

+

+  /**

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

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

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

@@ -1641,6 +1866,27 @@ public interface VampireLanguagePackage extends EPackage
   EClass getVLSTffTerm();

 

   /**

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

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

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

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

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

+   * @generated

+   */

+  EClass getVLSTerm();

+

+  /**

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

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

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

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

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

+   * @see #getVLSTerm()

+   * @generated

+   */

+  EAttribute getVLSTerm_Comment();

+

+  /**

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

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

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

@@ -1758,16 +2004,6 @@ public interface VampireLanguagePackage extends EPackage
   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 -->

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

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

-   * @generated

-   */

-  EClass getVLSTerm();

-

-  /**

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

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

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

@@ -2676,6 +2912,24 @@ public interface VampireLanguagePackage extends EPackage
     EClass VLS_TFF_TERM = eINSTANCE.getVLSTffTerm();

 

     /**

+     * 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 -->

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

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

+     * @generated

+     */

+    EClass VLS_TERM = eINSTANCE.getVLSTerm();

+

+    /**

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

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

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

+     * @generated

+     */

+    EAttribute VLS_TERM__COMMENT = eINSTANCE.getVLSTerm_Comment();

+

+    /**

      * 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 -->

@@ -2772,16 +3026,6 @@ public interface VampireLanguagePackage extends EPackage
     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 -->

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

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

-     * @generated

-     */

-    EClass VLS_TERM = eINSTANCE.getVLSTerm();

-

-    /**

      * 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 -->

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 c56d7ecd..9f1fa64f 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
@@ -6,18 +6,48 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;

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

 

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

+

 import org.eclipse.emf.ecore.EClass;

 

+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#getComment <em>Comment</em>}</li>

+ * </ul>

  *

  * @generated

  */

 public class VLSTermImpl extends VLSTffTermImpl implements VLSTerm

 {

   /**

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

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

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

+   * @see #getComment()

+   * @generated

+   * @ordered

+   */

+  protected static final String COMMENT_EDEFAULT = null;

+

+  /**

+   * The cached value of the '{@link #getComment() <em>Comment</em>}' attribute.

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

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

+   * @see #getComment()

+   * @generated

+   * @ordered

+   */

+  protected String comment = COMMENT_EDEFAULT;

+

+  /**

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

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

    * @generated

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

   }

 

+  /**

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

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

+   * @generated

+   */

+  public String getComment()

+  {

+    return comment;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public void setComment(String newComment)

+  {

+    String oldComment = comment;

+    comment = newComment;

+    if (eNotificationRequired())

+      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TERM__COMMENT, oldComment, comment));

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

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

+  {

+    switch (featureID)

+    {

+      case VampireLanguagePackage.VLS_TERM__COMMENT:

+        return getComment();

+    }

+    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__COMMENT:

+        setComment((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_TERM__COMMENT:

+        setComment(COMMENT_EDEFAULT);

+        return;

+    }

+    super.eUnset(featureID);

+  }

+

+  /**

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

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

+   * @generated

+   */

+  @Override

+  public boolean eIsSet(int featureID)

+  {

+    switch (featureID)

+    {

+      case VampireLanguagePackage.VLS_TERM__COMMENT:

+        return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);

+    }

+    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(" (comment: ");

+    result.append(comment);

+    result.append(')');

+    return result.toString();

+  }

+

 } //VLSTermImpl

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 0e25a4cc..c87155c9 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
@@ -72,11 +72,11 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
       case VampireLanguagePackage.VLS_TFF_FORMULA: return createVLSTffFormula();

       case VampireLanguagePackage.VLS_ANNOTATION: return createVLSAnnotation();

       case VampireLanguagePackage.VLS_TFF_TERM: return createVLSTffTerm();

+      case VampireLanguagePackage.VLS_TERM: return createVLSTerm();

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

@@ -192,6 +192,17 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

+  public VLSTerm createVLSTerm()

+  {

+    VLSTermImpl vlsTerm = new VLSTermImpl();

+    return vlsTerm;

+  }

+

+  /**

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

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

+   * @generated

+   */

   public VLSDeclaration createVLSDeclaration()

   {

     VLSDeclarationImpl vlsDeclaration = new VLSDeclarationImpl();

@@ -236,17 +247,6 @@ public class VampireLanguageFactoryImpl extends EFactoryImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public VLSTerm createVLSTerm()

-  {

-    VLSTermImpl vlsTerm = new VLSTermImpl();

-    return vlsTerm;

-  }

-

-  /**

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

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

-   * @generated

-   */

   public VLSVariable createVLSVariable()

   {

     VLSVariableImpl vlsVariable = new VLSVariableImpl();

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 676b2786..eae57e97 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
@@ -115,35 +115,35 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  private EClass vlsDeclarationEClass = null;

+  private EClass vlsTermEClass = null;

 

   /**

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

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

    * @generated

    */

-  private EClass vlsOtherDeclarationEClass = null;

+  private EClass vlsDeclarationEClass = null;

 

   /**

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

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

    * @generated

    */

-  private EClass vlsVariableDeclarationEClass = null;

+  private EClass vlsOtherDeclarationEClass = null;

 

   /**

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

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

    * @generated

    */

-  private EClass vlsTypeDefEClass = null;

+  private EClass vlsVariableDeclarationEClass = null;

 

   /**

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

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

    * @generated

    */

-  private EClass vlsTermEClass = null;

+  private EClass vlsTypeDefEClass = null;

 

   /**

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

@@ -639,6 +639,26 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

+  public EClass getVLSTerm()

+  {

+    return vlsTermEClass;

+  }

+

+  /**

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

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

+   * @generated

+   */

+  public EAttribute getVLSTerm_Comment()

+  {

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

+  }

+

+  /**

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

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

+   * @generated

+   */

   public EClass getVLSDeclaration()

   {

     return vlsDeclarationEClass;

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

    * @generated

    */

-  public EClass getVLSTerm()

-  {

-    return vlsTermEClass;

-  }

-

-  /**

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

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

-   * @generated

-   */

   public EClass getVLSVariable()

   {

     return vlsVariableEClass;

@@ -1464,6 +1474,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
 

     vlsTffTermEClass = createEClass(VLS_TFF_TERM);

 

+    vlsTermEClass = createEClass(VLS_TERM);

+    createEAttribute(vlsTermEClass, VLS_TERM__COMMENT);

+

     vlsDeclarationEClass = createEClass(VLS_DECLARATION);

     createEReference(vlsDeclarationEClass, VLS_DECLARATION__TYPE);

 

@@ -1479,8 +1492,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     createEReference(vlsTypeDefEClass, VLS_TYPE_DEF__INIT_TYPE);

     createEReference(vlsTypeDefEClass, VLS_TYPE_DEF__NEXT_TYPE);

 

-    vlsTermEClass = createEClass(VLS_TERM);

-

     vlsVariableEClass = createEClass(VLS_VARIABLE);

     createEAttribute(vlsVariableEClass, VLS_VARIABLE__NAME);

 

@@ -1604,10 +1615,10 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     // Set bounds for type parameters

 

     // Add supertypes to classes

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

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

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

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

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

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

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

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

@@ -1668,6 +1679,9 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
 

     initEClass(vlsTffTermEClass, VLSTffTerm.class, "VLSTffTerm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

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

+    initEAttribute(getVLSTerm_Comment(), ecorePackage.getEString(), "comment", null, 0, 1, VLSTerm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

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

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

 

@@ -1683,8 +1697,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     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);

-

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

 

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

       }

       @Override

+      public Adapter caseVLSTerm(VLSTerm object)

+      {

+        return createVLSTermAdapter();

+      }

+      @Override

       public Adapter caseVLSDeclaration(VLSDeclaration object)

       {

         return createVLSDeclarationAdapter();

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

       }

       @Override

-      public Adapter caseVLSTerm(VLSTerm object)

-      {

-        return createVLSTermAdapter();

-      }

-      @Override

       public Adapter caseVLSVariable(VLSVariable object)

       {

         return createVLSVariableAdapter();

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

 

   /**

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

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

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

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

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

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

    * @return the new adapter.

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

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

    * @generated

    */

-  public Adapter createVLSDeclarationAdapter()

+  public Adapter createVLSTermAdapter()

   {

     return null;

   }

 

   /**

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

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

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

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

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

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

    * @return the new adapter.

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

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

    * @generated

    */

-  public Adapter createVLSOtherDeclarationAdapter()

+  public Adapter createVLSDeclarationAdapter()

   {

     return null;

   }

 

   /**

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

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

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

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

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

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

    * @return the new adapter.

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

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

    * @generated

    */

-  public Adapter createVLSVariableDeclarationAdapter()

+  public Adapter createVLSOtherDeclarationAdapter()

   {

     return null;

   }

 

   /**

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

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

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

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

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

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

    * @return the new adapter.

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

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

    * @generated

    */

-  public Adapter createVLSTypeDefAdapter()

+  public Adapter createVLSVariableDeclarationAdapter()

   {

     return null;

   }

 

   /**

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

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

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

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

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

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

    * @return the new adapter.

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

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

    * @generated

    */

-  public Adapter createVLSTermAdapter()

+  public Adapter createVLSTypeDefAdapter()

   {

     return null;

   }

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

         return result;

       }

+      case VampireLanguagePackage.VLS_TERM:

+      {

+        VLSTerm vlsTerm = (VLSTerm)theEObject;

+        T result = caseVLSTerm(vlsTerm);

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

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

+        return result;

+      }

       case VampireLanguagePackage.VLS_DECLARATION:

       {

         VLSDeclaration vlsDeclaration = (VLSDeclaration)theEObject;

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

         return result;

       }

-      case VampireLanguagePackage.VLS_TERM:

-      {

-        VLSTerm vlsTerm = (VLSTerm)theEObject;

-        T result = caseVLSTerm(vlsTerm);

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

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

-        return result;

-      }

       case VampireLanguagePackage.VLS_VARIABLE:

       {

         VLSVariable vlsVariable = (VLSVariable)theEObject;

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

 

   /**

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

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

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

    * This implementation returns null;

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

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

    * @param object the target of the switch.

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

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

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

    * @generated

    */

-  public T caseVLSDeclaration(VLSDeclaration object)

+  public T caseVLSTerm(VLSTerm object)

   {

     return null;

   }

 

   /**

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

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

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

    * This implementation returns null;

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

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

    * @param object the target of the switch.

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

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

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

    * @generated

    */

-  public T caseVLSOtherDeclaration(VLSOtherDeclaration object)

+  public T caseVLSDeclaration(VLSDeclaration object)

   {

     return null;

   }

 

   /**

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

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

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

    * This implementation returns null;

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

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

    * @param object the target of the switch.

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

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

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

    * @generated

    */

-  public T caseVLSVariableDeclaration(VLSVariableDeclaration object)

+  public T caseVLSOtherDeclaration(VLSOtherDeclaration object)

   {

     return null;

   }

 

   /**

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

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

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

    * This implementation returns null;

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

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

    * @param object the target of the switch.

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

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

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

    * @generated

    */

-  public T caseVLSTypeDef(VLSTypeDef object)

+  public T caseVLSVariableDeclaration(VLSVariableDeclaration object)

   {

     return null;

   }

 

   /**

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

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

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

    * This implementation returns null;

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

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

    * @param object the target of the switch.

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

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

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

    * @generated

    */

-  public T caseVLSTerm(VLSTerm object)

+  public T caseVLSTypeDef(VLSTypeDef object)

   {

     return null;

   }