4 files changed, 58 insertions, 4 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/GenerateVampireLanguage.mwe2 b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/GenerateVampireLanguage.mwe2
index 903ac83b..2fe82482 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/GenerateVampireLanguage.mwe2
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/GenerateVampireLanguage.mwe2
@@ -6,7 +6,7 @@ import org.eclipse.xtext.xtext.generator.model.project.*
 var rootPath = ".."

 

 Workflow {

-        

+        //TODO

         component = XtextGenerator {

                 configuration = {

                         project = StandardProjectConfig {

@@ -39,6 +39,9 @@ Workflow {
                         validator = {

                                 // composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"

                         }

+                        formatter={

+                                generateStub=true

+                        }

                 }

         }

 }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtext b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtext
index daa15ca1..d5b40ed9 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtext
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtext
@@ -50,12 +50,15 @@ terminal UNSIGNED_RAT_ID:  (LITERAL) ('/') ('1'..'9') (INT)? ;
 terminal SIGNED_RAT_ID: (SIGN)* (UNSIGNED_RAT_ID);

 

 //Overwriting is necessary

-terminal ANY_OTHER: '%' (!('\n'|'\r'))* ('\r');

+terminal ID: (!('\n'|'\r'))* ;

+terminal ANY_OTHER: ID;

 terminal SINGLE_COMMENT: ANY_OTHER;

 //terminal ID:  ( !('('|')'|'\r'|'\n') )+ ;

 

 

 

+

+

 //////////////////////////////////

 // VLS types

 //////////////////////////////////

@@ -71,7 +74,7 @@ VLSName:
 

 // <comments>

 VLSComment:

-        comment = SINGLE_COMMENT

+        '%' comment = SINGLE_COMMENT

         //need to add a new line at the end of the file for the case where the last line is a comment

 ;

 

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
new file mode 100644
index 00000000..f943daad
--- /dev/null
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/formatting2/VampireLanguageFormatter.xtend
@@ -0,0 +1,48 @@
+/*

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

+import org.eclipse.xtext.formatting2.IFormattableDocument

+

+class VampireLanguageFormatter extends AbstractFormatter2 {

+        

+        @Inject extension VampireLanguageGrammarAccess

+

+        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 (VLSComment vLSComment : vampireModel.getComments()) {

+                        vLSComment.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(VLSFofFormula formula, extension IFormattableDocument document){

+                formula.append[newLine]

+        }

+        

+        def dispatch void format(VLSComment comment, extension IFormattableDocument document){

+                comment.append[newLine]

+        }

+        // TODO: implement for VLSFofFormula, VLSAnnotation, VLSAnd, VLSOr, VLSUniversalQuantifier, VLSExistentialQuantifier, VLSUnaryNegation, VLSFunction, VLSLess, VLSFunctionFof, VLSEquivalent, VLSImplies, VLSRevImplies, VLSXnor, VLSNor, VLSNand, VLSInequality, VLSEquality, VLSAssignment

+}

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/scoping/VampireLanguageScopeProvider.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/scoping/VampireLanguageScopeProvider.xtend
index d6b4a1ae..fb967eee 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/scoping/VampireLanguageScopeProvider.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src/ca/mcgill/ecse/dslreasoner/scoping/VampireLanguageScopeProvider.xtend
@@ -11,5 +11,5 @@ package ca.mcgill.ecse.dslreasoner.scoping
  * on how and when to use it.

  */

 class VampireLanguageScopeProvider extends AbstractVampireLanguageScopeProvider {

-

+        //TODO

 }