This branch is ready to be merged into masterVampire-New

17 files changed, 0 insertions, 178 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
deleted file mode 100644
index d1d2ff77..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
+++ /dev/null
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin
deleted file mode 100644
index 27afa8ba..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin
+++ /dev/null
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.gitignore b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.gitignore
deleted file mode 100644
index 87793e06..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/.VampireLanguageRuntimeModule.java._trace
-/.VampireLanguageStandaloneSetup.java._trace
-/.VampireLanguageRuntimeModule.xtendbin
-/.VampireLanguageStandaloneSetup.xtendbin
-/VampireLanguageRuntimeModule.java
-/VampireLanguageStandaloneSetup.java
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/VampireLanguageRuntimeModule.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/VampireLanguageRuntimeModule.java
deleted file mode 100644
index 4592f574..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/VampireLanguageRuntimeModule.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**

- * generated by Xtext 2.12.0

- */

-package ca.mcgill.ecse.dslreasoner;

-

-import ca.mcgill.ecse.dslreasoner.AbstractVampireLanguageRuntimeModule;

-

-/**

- * Use this class to register components to be used at runtime / without the Equinox extension registry.

- */

-@SuppressWarnings("all")

-public class VampireLanguageRuntimeModule extends AbstractVampireLanguageRuntimeModule {

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/VampireLanguageStandaloneSetup.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/VampireLanguageStandaloneSetup.java
deleted file mode 100644
index e33cd1fe..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/VampireLanguageStandaloneSetup.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/**

- * generated by Xtext 2.12.0

- */

-package ca.mcgill.ecse.dslreasoner;

-

-import ca.mcgill.ecse.dslreasoner.VampireLanguageStandaloneSetupGenerated;

-

-/**

- * Initialization support for running Xtext languages without Equinox extension registry.

- */

-@SuppressWarnings("all")

-public class VampireLanguageStandaloneSetup extends VampireLanguageStandaloneSetupGenerated {

-  public static void doSetup() {

-    new VampireLanguageStandaloneSetup().createInjectorAndDoEMFRegistration();

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
deleted file mode 100644
index d1a3a13d..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
+++ /dev/null
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.gitignore b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.gitignore
deleted file mode 100644
index 2e4f4654..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.VampireLanguageFormatter.java._trace
-/.VampireLanguageFormatter.xtendbin
-/VampireLanguageFormatter.java
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/VampireLanguageFormatter.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/VampireLanguageFormatter.java
deleted file mode 100644
index 48b973e7..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/VampireLanguageFormatter.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**

- * generated by Xtext 2.12.0

- */

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

-

-import ca.mcgill.ecse.dslreasoner.services.VampireLanguageGrammarAccess;

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

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

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

-import com.google.inject.Inject;

-import java.util.Arrays;

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

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

-import org.eclipse.xtext.formatting2.AbstractFormatter2;

-import org.eclipse.xtext.formatting2.IFormattableDocument;

-import org.eclipse.xtext.formatting2.IHiddenRegionFormatter;

-import org.eclipse.xtext.resource.XtextResource;

-import org.eclipse.xtext.xbase.lib.Extension;

-import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;

-

-@SuppressWarnings("all")

-public class VampireLanguageFormatter extends AbstractFormatter2 {

-  @Inject

-  @Extension

-  private VampireLanguageGrammarAccess _vampireLanguageGrammarAccess;

-  

-  protected void _format(final VampireModel vampireModel, @Extension final IFormattableDocument document) {

-    EList<VLSComment> _comments = vampireModel.getComments();

-    for (final VLSComment vLSComment : _comments) {

-      document.<VLSComment>format(vLSComment);

-    }

-    EList<VLSFofFormula> _formulas = vampireModel.getFormulas();

-    for (final VLSFofFormula vLSFofFormula : _formulas) {

-      document.<VLSFofFormula>format(vLSFofFormula);

-    }

-  }

-  

-  protected void _format(final VLSFofFormula formula, @Extension final IFormattableDocument document) {

-    final Procedure1<IHiddenRegionFormatter> _function = (IHiddenRegionFormatter it) -> {

-      it.newLine();

-    };

-    document.<VLSFofFormula>append(formula, _function);

-  }

-  

-  protected void _format(final VLSComment comment, @Extension final IFormattableDocument document) {

-    final Procedure1<IHiddenRegionFormatter> _function = (IHiddenRegionFormatter it) -> {

-      it.newLine();

-    };

-    document.<VLSComment>append(comment, _function);

-  }

-  

-  public void format(final Object comment, final IFormattableDocument document) {

-    if (comment instanceof XtextResource) {

-      _format((XtextResource)comment, document);

-      return;

-    } else if (comment instanceof VLSComment) {

-      _format((VLSComment)comment, document);

-      return;

-    } else if (comment instanceof VLSFofFormula) {

-      _format((VLSFofFormula)comment, document);

-      return;

-    } else if (comment instanceof VampireModel) {

-      _format((VampireModel)comment, document);

-      return;

-    } else if (comment instanceof EObject) {

-      _format((EObject)comment, document);

-      return;

-    } else if (comment == null) {

-      _format((Void)null, document);

-      return;

-    } else if (comment != null) {

-      _format(comment, document);

-      return;

-    } else {

-      throw new IllegalArgumentException("Unhandled parameter types: " +

-        Arrays.<Object>asList(comment, document).toString());

-    }

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin
deleted file mode 100644
index 6d2a9063..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin
+++ /dev/null
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.gitignore b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.gitignore
deleted file mode 100644
index b3ec8dd5..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.VampireLanguageGenerator.java._trace
-/.VampireLanguageGenerator.xtendbin
-/VampireLanguageGenerator.java
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/VampireLanguageGenerator.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/VampireLanguageGenerator.java
deleted file mode 100644
index 038c7c4f..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/VampireLanguageGenerator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**

- * generated by Xtext 2.12.0

- */

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

-

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.xtext.generator.AbstractGenerator;

-import org.eclipse.xtext.generator.IFileSystemAccess2;

-import org.eclipse.xtext.generator.IGeneratorContext;

-

-/**

- * Generates code from your model files on save.

- * 

- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#code-generation

- */

-@SuppressWarnings("all")

-public class VampireLanguageGenerator extends AbstractGenerator {

-  @Override

-  public void doGenerate(final Resource resource, final IFileSystemAccess2 fsa, final IGeneratorContext context) {

-  }

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin
deleted file mode 100644
index a9942913..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin
+++ /dev/null
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.gitignore b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.gitignore
deleted file mode 100644
index ea4b064e..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.VampireLanguageScopeProvider.java._trace
-/.VampireLanguageScopeProvider.xtendbin
-/VampireLanguageScopeProvider.java
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/VampireLanguageScopeProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/VampireLanguageScopeProvider.java
deleted file mode 100644
index 2ea3ee1e..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/VampireLanguageScopeProvider.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/**

- * generated by Xtext 2.12.0

- */

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

-

-import ca.mcgill.ecse.dslreasoner.scoping.AbstractVampireLanguageScopeProvider;

-

-/**

- * This class contains custom scoping description.

- * 

- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#scoping

- * on how and when to use it.

- */

-@SuppressWarnings("all")

-public class VampireLanguageScopeProvider extends AbstractVampireLanguageScopeProvider {

-}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin
deleted file mode 100644
index cd467bbd..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin
+++ /dev/null
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.gitignore b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.gitignore
deleted file mode 100644
index d7fe565a..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.VampireLanguageValidator.java._trace
-/.VampireLanguageValidator.xtendbin
-/VampireLanguageValidator.java
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageValidator.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageValidator.java
deleted file mode 100644
index 9d112239..00000000
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/VampireLanguageValidator.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/**

- * generated by Xtext 2.12.0

- */

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

-

-import ca.mcgill.ecse.dslreasoner.validation.AbstractVampireLanguageValidator;

-

-/**

- * This class contains custom validation rules.

- * 

- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#validation

- */

-@SuppressWarnings("all")

-public class VampireLanguageValidator extends AbstractVampireLanguageValidator {

-}