1 files changed, 99 insertions, 51 deletions

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