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

1 files changed, 12 insertions, 14 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/formatting2/VampireLanguageFormatter.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/formatting2/VampireLanguageFormatter.xtend
index f943daad..4fc67b22 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/formatting2/VampireLanguageFormatter.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/formatting2/VampireLanguageFormatter.xtend
@@ -6,8 +6,6 @@ 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.VLSInclude

-import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSName

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

 import com.google.inject.Inject

 import org.eclipse.xtext.formatting2.AbstractFormatter2

@@ -19,23 +17,23 @@ class VampireLanguageFormatter extends AbstractFormatter2 {
 

         def dispatch void format(VampireModel vampireModel, extension IFormattableDocument document) {

                 // TODO: format HiddenRegions around keywords, attributes, cross references, etc. 

-                for (VLSInclude vLSInclude : vampireModel.getIncludes()) {

-                        vLSInclude.format;

-                }

+//              for (VLSInclude vLSInclude : vampireModel.getIncludes()) {

+//                      vLSInclude.format;

+//              }

                 for (VLSComment vLSComment : vampireModel.getComments()) {

                         vLSComment.format;

                 }

-                for (VLSFofFormula vLSFofFormula : vampireModel.getFormulas()) {

-                        vLSFofFormula.format;

-                }

+//              for (VLSFofFormula vLSFofFormula : vampireModel.getFormulas()) {

+//                      vLSFofFormula.format;

+//              }

         }

 

-        def dispatch void format(VLSInclude vLSInclude, extension IFormattableDocument document) {

-                // TODO: format HiddenRegions around keywords, attributes, cross references, etc. 

-                for (VLSName vLSName : vLSInclude.getNames()) {

-                        vLSName.format;

-                }

-        }

+//      def dispatch void format(VLSInclude vLSInclude, extension IFormattableDocument document) {

+//              // TODO: format HiddenRegions around keywords, attributes, cross references, etc. 

+//              for (VLSName vLSName : vLSInclude.getNames()) {

+//                      vLSName.format;

+//              }

+//      }

         

         def dispatch void format(VLSFofFormula formula, extension IFormattableDocument document){

                 formula.append[newLine]