1 files changed, 159 insertions, 79 deletions
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageAdapterFactory.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageAdapterFactory.java
index 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;