VAMPIRE: implement Vampire Model Interpreter, 2/3 done

55 files changed, 2022 insertions, 1763 deletions

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/VampireLanguageParser.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/VampireLanguageParser.java
index 48510a2d..e3b7a679 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/VampireLanguageParser.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/VampireLanguageParser.java
@@ -128,7 +128,9 @@ public class VampireLanguageParser extends AbstractContentAssistParser {
                         builder.put(grammarAccess.getVLSAnnotationAccess().getFollowupAssignment_2_1(), "rule__VLSAnnotation__FollowupAssignment_2_1");

                         builder.put(grammarAccess.getVLSAnnotationTermsAccess().getTermsAssignment_0(), "rule__VLSAnnotationTerms__TermsAssignment_0");

                         builder.put(grammarAccess.getVLSAnnotationTermsAccess().getTermsAssignment_1_1(), "rule__VLSAnnotationTerms__TermsAssignment_1_1");

+                        builder.put(grammarAccess.getVLSOtherDeclarationAccess().getNameAssignment_0(), "rule__VLSOtherDeclaration__NameAssignment_0");

                         builder.put(grammarAccess.getVLSOtherDeclarationAccess().getTypeAssignment_2(), "rule__VLSOtherDeclaration__TypeAssignment_2");

+                        builder.put(grammarAccess.getVLSVariableDeclarationAccess().getNameAssignment_0(), "rule__VLSVariableDeclaration__NameAssignment_0");

                         builder.put(grammarAccess.getVLSVariableDeclarationAccess().getTypeAssignment_2(), "rule__VLSVariableDeclaration__TypeAssignment_2");

                         builder.put(grammarAccess.getVLSTypeDefAccess().getTypeSigAssignment_0(), "rule__VLSTypeDef__TypeSigAssignment_0");

                         builder.put(grammarAccess.getVLSTypeDefAccess().getMapsToAssignment_1_1(), "rule__VLSTypeDef__MapsToAssignment_1_1");

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguage.g b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguage.g
index 8bab57ae..7b766803 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguage.g
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguage.g
@@ -3191,9 +3191,9 @@ rule__VLSOtherDeclaration__Group__0__Impl
         }

 :

 (

-        { before(grammarAccess.getVLSOtherDeclarationAccess().getVLSAtomicConstantParserRuleCall_0()); }

-        ruleVLSAtomicConstant

-        { after(grammarAccess.getVLSOtherDeclarationAccess().getVLSAtomicConstantParserRuleCall_0()); }

+        { before(grammarAccess.getVLSOtherDeclarationAccess().getNameAssignment_0()); }

+        (rule__VLSOtherDeclaration__NameAssignment_0)

+        { after(grammarAccess.getVLSOtherDeclarationAccess().getNameAssignment_0()); }

 )

 ;

 finally {

@@ -3272,9 +3272,9 @@ rule__VLSVariableDeclaration__Group__0__Impl
         }

 :

 (

-        { before(grammarAccess.getVLSVariableDeclarationAccess().getVLSVariableParserRuleCall_0()); }

-        ruleVLSVariable

-        { after(grammarAccess.getVLSVariableDeclarationAccess().getVLSVariableParserRuleCall_0()); }

+        { before(grammarAccess.getVLSVariableDeclarationAccess().getNameAssignment_0()); }

+        (rule__VLSVariableDeclaration__NameAssignment_0)

+        { after(grammarAccess.getVLSVariableDeclarationAccess().getNameAssignment_0()); }

 )

 ;

 finally {

@@ -6359,6 +6359,21 @@ finally {
         restoreStackSize(stackSize);

 }

 

+rule__VLSOtherDeclaration__NameAssignment_0

+        @init {

+                int stackSize = keepStackSize();

+        }

+:

+        (

+                { before(grammarAccess.getVLSOtherDeclarationAccess().getNameVLSAtomicConstantParserRuleCall_0_0()); }

+                ruleVLSAtomicConstant

+                { after(grammarAccess.getVLSOtherDeclarationAccess().getNameVLSAtomicConstantParserRuleCall_0_0()); }

+        )

+;

+finally {

+        restoreStackSize(stackSize);

+}

+

 rule__VLSOtherDeclaration__TypeAssignment_2

         @init {

                 int stackSize = keepStackSize();

@@ -6374,6 +6389,21 @@ finally {
         restoreStackSize(stackSize);

 }

 

+rule__VLSVariableDeclaration__NameAssignment_0

+        @init {

+                int stackSize = keepStackSize();

+        }

+:

+        (

+                { before(grammarAccess.getVLSVariableDeclarationAccess().getNameVLSVariableParserRuleCall_0_0()); }

+                ruleVLSVariable

+                { after(grammarAccess.getVLSVariableDeclarationAccess().getNameVLSVariableParserRuleCall_0_0()); }

+        )

+;

+finally {

+        restoreStackSize(stackSize);

+}

+

 rule__VLSVariableDeclaration__TypeAssignment_2

         @init {

                 int stackSize = keepStackSize();

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageLexer.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageLexer.java
index 4efcb64c..82eb18b1 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageLexer.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageLexer.java
@@ -1331,8 +1331,8 @@ public class InternalVampireLanguageLexer extends Lexer {
     // $ANTLR start "RULE_ALPHA_NUMERIC"

     public final void mRULE_ALPHA_NUMERIC() throws RecognitionException {

         try {

-            // InternalVampireLanguage.g:6816:29: ( ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' ) )

-            // InternalVampireLanguage.g:6816:31: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )

+            // InternalVampireLanguage.g:6846:29: ( ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' ) )

+            // InternalVampireLanguage.g:6846:31: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )

             {

             if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {

                 input.consume();

@@ -1357,11 +1357,11 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_UPPER_WORD_ID;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6818:20: ( 'A' .. 'Z' ( RULE_ALPHA_NUMERIC )* )

-            // InternalVampireLanguage.g:6818:22: 'A' .. 'Z' ( RULE_ALPHA_NUMERIC )*

+            // InternalVampireLanguage.g:6848:20: ( 'A' .. 'Z' ( RULE_ALPHA_NUMERIC )* )

+            // InternalVampireLanguage.g:6848:22: 'A' .. 'Z' ( RULE_ALPHA_NUMERIC )*

             {

             matchRange('A','Z'); 

-            // InternalVampireLanguage.g:6818:31: ( RULE_ALPHA_NUMERIC )*

+            // InternalVampireLanguage.g:6848:31: ( RULE_ALPHA_NUMERIC )*

             loop1:

             do {

                 int alt1=2;

@@ -1374,7 +1374,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt1) {

                 case 1 :

-                    // InternalVampireLanguage.g:6818:31: RULE_ALPHA_NUMERIC

+                    // InternalVampireLanguage.g:6848:31: RULE_ALPHA_NUMERIC

                     {

                     mRULE_ALPHA_NUMERIC(); 

 

@@ -1402,11 +1402,11 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_LOWER_WORD_ID;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6820:20: ( 'a' .. 'z' ( RULE_ALPHA_NUMERIC )* )

-            // InternalVampireLanguage.g:6820:22: 'a' .. 'z' ( RULE_ALPHA_NUMERIC )*

+            // InternalVampireLanguage.g:6850:20: ( 'a' .. 'z' ( RULE_ALPHA_NUMERIC )* )

+            // InternalVampireLanguage.g:6850:22: 'a' .. 'z' ( RULE_ALPHA_NUMERIC )*

             {

             matchRange('a','z'); 

-            // InternalVampireLanguage.g:6820:31: ( RULE_ALPHA_NUMERIC )*

+            // InternalVampireLanguage.g:6850:31: ( RULE_ALPHA_NUMERIC )*

             loop2:

             do {

                 int alt2=2;

@@ -1419,7 +1419,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt2) {

                 case 1 :

-                    // InternalVampireLanguage.g:6820:31: RULE_ALPHA_NUMERIC

+                    // InternalVampireLanguage.g:6850:31: RULE_ALPHA_NUMERIC

                     {

                     mRULE_ALPHA_NUMERIC(); 

 

@@ -1447,11 +1447,11 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_DOUBLE_QUOTE;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6822:19: ( '\"' ( '\\\\' ( '\"' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )

-            // InternalVampireLanguage.g:6822:21: '\"' ( '\\\\' ( '\"' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'

+            // InternalVampireLanguage.g:6852:19: ( '\"' ( '\\\\' ( '\"' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )

+            // InternalVampireLanguage.g:6852:21: '\"' ( '\\\\' ( '\"' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'

             {

             match('\"'); 

-            // InternalVampireLanguage.g:6822:25: ( '\\\\' ( '\"' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*

+            // InternalVampireLanguage.g:6852:25: ( '\\\\' ( '\"' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*

             loop3:

             do {

                 int alt3=3;

@@ -1467,7 +1467,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt3) {

                 case 1 :

-                    // InternalVampireLanguage.g:6822:26: '\\\\' ( '\"' | '\\\\' )

+                    // InternalVampireLanguage.g:6852:26: '\\\\' ( '\"' | '\\\\' )

                     {

                     match('\\'); 

                     if ( input.LA(1)=='\"'||input.LA(1)=='\\' ) {

@@ -1483,7 +1483,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:6822:42: ~ ( ( '\\\\' | '\"' ) )

+                    // InternalVampireLanguage.g:6852:42: ~ ( ( '\\\\' | '\"' ) )

                     {

                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {

                         input.consume();

@@ -1520,11 +1520,11 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_SINGLE_QUOTE;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6824:19: ( '\\'' ( '\\\\' ( '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )+ '\\'' )

-            // InternalVampireLanguage.g:6824:21: '\\'' ( '\\\\' ( '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )+ '\\''

+            // InternalVampireLanguage.g:6854:19: ( '\\'' ( '\\\\' ( '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )+ '\\'' )

+            // InternalVampireLanguage.g:6854:21: '\\'' ( '\\\\' ( '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )+ '\\''

             {

             match('\''); 

-            // InternalVampireLanguage.g:6824:26: ( '\\\\' ( '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )+

+            // InternalVampireLanguage.g:6854:26: ( '\\\\' ( '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )+

             int cnt4=0;

             loop4:

             do {

@@ -1541,7 +1541,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt4) {

                 case 1 :

-                    // InternalVampireLanguage.g:6824:27: '\\\\' ( '\\'' | '\\\\' )

+                    // InternalVampireLanguage.g:6854:27: '\\\\' ( '\\'' | '\\\\' )

                     {

                     match('\\'); 

                     if ( input.LA(1)=='\''||input.LA(1)=='\\' ) {

@@ -1557,7 +1557,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:6824:44: ~ ( ( '\\\\' | '\\'' ) )

+                    // InternalVampireLanguage.g:6854:44: ~ ( ( '\\\\' | '\\'' ) )

                     {

                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {

                         input.consume();

@@ -1596,8 +1596,8 @@ public class InternalVampireLanguageLexer extends Lexer {
     // $ANTLR start "RULE_SIGN"

     public final void mRULE_SIGN() throws RecognitionException {

         try {

-            // InternalVampireLanguage.g:6826:20: ( ( '+' | '-' ) )

-            // InternalVampireLanguage.g:6826:22: ( '+' | '-' )

+            // InternalVampireLanguage.g:6856:20: ( ( '+' | '-' ) )

+            // InternalVampireLanguage.g:6856:22: ( '+' | '-' )

             {

             if ( input.LA(1)=='+'||input.LA(1)=='-' ) {

                 input.consume();

@@ -1622,8 +1622,8 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_DOLLAR_ID;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6828:16: ( '$' RULE_LOWER_WORD_ID )

-            // InternalVampireLanguage.g:6828:18: '$' RULE_LOWER_WORD_ID

+            // InternalVampireLanguage.g:6858:16: ( '$' RULE_LOWER_WORD_ID )

+            // InternalVampireLanguage.g:6858:18: '$' RULE_LOWER_WORD_ID

             {

             match('$'); 

             mRULE_LOWER_WORD_ID(); 

@@ -1643,8 +1643,8 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_DOUBLE_DOLLAR_ID;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6830:23: ( '$$' RULE_LOWER_WORD_ID )

-            // InternalVampireLanguage.g:6830:25: '$$' RULE_LOWER_WORD_ID

+            // InternalVampireLanguage.g:6860:23: ( '$$' RULE_LOWER_WORD_ID )

+            // InternalVampireLanguage.g:6860:25: '$$' RULE_LOWER_WORD_ID

             {

             match("$$"); 

 

@@ -1665,10 +1665,10 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_LITERAL;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6832:14: ( ( '0' | '1' .. '9' ( RULE_INT )? ) )

-            // InternalVampireLanguage.g:6832:16: ( '0' | '1' .. '9' ( RULE_INT )? )

+            // InternalVampireLanguage.g:6862:14: ( ( '0' | '1' .. '9' ( RULE_INT )? ) )

+            // InternalVampireLanguage.g:6862:16: ( '0' | '1' .. '9' ( RULE_INT )? )

             {

-            // InternalVampireLanguage.g:6832:16: ( '0' | '1' .. '9' ( RULE_INT )? )

+            // InternalVampireLanguage.g:6862:16: ( '0' | '1' .. '9' ( RULE_INT )? )

             int alt6=2;

             int LA6_0 = input.LA(1);

 

@@ -1686,17 +1686,17 @@ public class InternalVampireLanguageLexer extends Lexer {
             }

             switch (alt6) {

                 case 1 :

-                    // InternalVampireLanguage.g:6832:17: '0'

+                    // InternalVampireLanguage.g:6862:17: '0'

                     {

                     match('0'); 

 

                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:6832:21: '1' .. '9' ( RULE_INT )?

+                    // InternalVampireLanguage.g:6862:21: '1' .. '9' ( RULE_INT )?

                     {

                     matchRange('1','9'); 

-                    // InternalVampireLanguage.g:6832:30: ( RULE_INT )?

+                    // InternalVampireLanguage.g:6862:30: ( RULE_INT )?

                     int alt5=2;

                     int LA5_0 = input.LA(1);

 

@@ -1705,7 +1705,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                     }

                     switch (alt5) {

                         case 1 :

-                            // InternalVampireLanguage.g:6832:30: RULE_INT

+                            // InternalVampireLanguage.g:6862:30: RULE_INT

                             {

                             mRULE_INT(); 

 

@@ -1736,10 +1736,10 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_SIGNED_LITERAL;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6834:21: ( ( RULE_SIGN )* RULE_LITERAL )

-            // InternalVampireLanguage.g:6834:23: ( RULE_SIGN )* RULE_LITERAL

+            // InternalVampireLanguage.g:6864:21: ( ( RULE_SIGN )* RULE_LITERAL )

+            // InternalVampireLanguage.g:6864:23: ( RULE_SIGN )* RULE_LITERAL

             {

-            // InternalVampireLanguage.g:6834:23: ( RULE_SIGN )*

+            // InternalVampireLanguage.g:6864:23: ( RULE_SIGN )*

             loop7:

             do {

                 int alt7=2;

@@ -1752,7 +1752,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt7) {

                 case 1 :

-                    // InternalVampireLanguage.g:6834:23: RULE_SIGN

+                    // InternalVampireLanguage.g:6864:23: RULE_SIGN

                     {

                     mRULE_SIGN(); 

 

@@ -1781,11 +1781,11 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_SINGLE_COMMENT;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6836:21: ( '%' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )

-            // InternalVampireLanguage.g:6836:23: '%' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?

+            // InternalVampireLanguage.g:6866:21: ( '%' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )

+            // InternalVampireLanguage.g:6866:23: '%' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?

             {

             match('%'); 

-            // InternalVampireLanguage.g:6836:27: (~ ( ( '\\n' | '\\r' ) ) )*

+            // InternalVampireLanguage.g:6866:27: (~ ( ( '\\n' | '\\r' ) ) )*

             loop8:

             do {

                 int alt8=2;

@@ -1798,7 +1798,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt8) {

                 case 1 :

-                    // InternalVampireLanguage.g:6836:27: ~ ( ( '\\n' | '\\r' ) )

+                    // InternalVampireLanguage.g:6866:27: ~ ( ( '\\n' | '\\r' ) )

                     {

                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {

                         input.consume();

@@ -1818,7 +1818,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                 }

             } while (true);

 

-            // InternalVampireLanguage.g:6836:43: ( ( '\\r' )? '\\n' )?

+            // InternalVampireLanguage.g:6866:43: ( ( '\\r' )? '\\n' )?

             int alt10=2;

             int LA10_0 = input.LA(1);

 

@@ -1827,9 +1827,9 @@ public class InternalVampireLanguageLexer extends Lexer {
             }

             switch (alt10) {

                 case 1 :

-                    // InternalVampireLanguage.g:6836:44: ( '\\r' )? '\\n'

+                    // InternalVampireLanguage.g:6866:44: ( '\\r' )? '\\n'

                     {

-                    // InternalVampireLanguage.g:6836:44: ( '\\r' )?

+                    // InternalVampireLanguage.g:6866:44: ( '\\r' )?

                     int alt9=2;

                     int LA9_0 = input.LA(1);

 

@@ -1838,7 +1838,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                     }

                     switch (alt9) {

                         case 1 :

-                            // InternalVampireLanguage.g:6836:44: '\\r'

+                            // InternalVampireLanguage.g:6866:44: '\\r'

                             {

                             match('\r'); 

 

@@ -1870,10 +1870,10 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_ID;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6838:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )

-            // InternalVampireLanguage.g:6838:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*

+            // InternalVampireLanguage.g:6868:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )

+            // InternalVampireLanguage.g:6868:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*

             {

-            // InternalVampireLanguage.g:6838:11: ( '^' )?

+            // InternalVampireLanguage.g:6868:11: ( '^' )?

             int alt11=2;

             int LA11_0 = input.LA(1);

 

@@ -1882,7 +1882,7 @@ public class InternalVampireLanguageLexer extends Lexer {
             }

             switch (alt11) {

                 case 1 :

-                    // InternalVampireLanguage.g:6838:11: '^'

+                    // InternalVampireLanguage.g:6868:11: '^'

                     {

                     match('^'); 

 

@@ -1900,7 +1900,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                 recover(mse);

                 throw mse;}

 

-            // InternalVampireLanguage.g:6838:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*

+            // InternalVampireLanguage.g:6868:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*

             loop12:

             do {

                 int alt12=2;

@@ -1947,10 +1947,10 @@ public class InternalVampireLanguageLexer extends Lexer {
     // $ANTLR start "RULE_INT"

     public final void mRULE_INT() throws RecognitionException {

         try {

-            // InternalVampireLanguage.g:6840:19: ( ( '0' .. '9' )+ )

-            // InternalVampireLanguage.g:6840:21: ( '0' .. '9' )+

+            // InternalVampireLanguage.g:6870:19: ( ( '0' .. '9' )+ )

+            // InternalVampireLanguage.g:6870:21: ( '0' .. '9' )+

             {

-            // InternalVampireLanguage.g:6840:21: ( '0' .. '9' )+

+            // InternalVampireLanguage.g:6870:21: ( '0' .. '9' )+

             int cnt13=0;

             loop13:

             do {

@@ -1964,7 +1964,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt13) {

                 case 1 :

-                    // InternalVampireLanguage.g:6840:22: '0' .. '9'

+                    // InternalVampireLanguage.g:6870:22: '0' .. '9'

                     {

                     matchRange('0','9'); 

 

@@ -1994,10 +1994,10 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_STRING;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6842:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )

-            // InternalVampireLanguage.g:6842:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

+            // InternalVampireLanguage.g:6872:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )

+            // InternalVampireLanguage.g:6872:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

             {

-            // InternalVampireLanguage.g:6842:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

+            // InternalVampireLanguage.g:6872:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

             int alt16=2;

             int LA16_0 = input.LA(1);

 

@@ -2015,10 +2015,10 @@ public class InternalVampireLanguageLexer extends Lexer {
             }

             switch (alt16) {

                 case 1 :

-                    // InternalVampireLanguage.g:6842:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'

+                    // InternalVampireLanguage.g:6872:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'

                     {

                     match('\"'); 

-                    // InternalVampireLanguage.g:6842:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*

+                    // InternalVampireLanguage.g:6872:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*

                     loop14:

                     do {

                         int alt14=3;

@@ -2034,7 +2034,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                         switch (alt14) {

                         case 1 :

-                            // InternalVampireLanguage.g:6842:21: '\\\\' .

+                            // InternalVampireLanguage.g:6872:21: '\\\\' .

                             {

                             match('\\'); 

                             matchAny(); 

@@ -2042,7 +2042,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                             }

                             break;

                         case 2 :

-                            // InternalVampireLanguage.g:6842:28: ~ ( ( '\\\\' | '\"' ) )

+                            // InternalVampireLanguage.g:6872:28: ~ ( ( '\\\\' | '\"' ) )

                             {

                             if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {

                                 input.consume();

@@ -2067,10 +2067,10 @@ public class InternalVampireLanguageLexer extends Lexer {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:6842:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''

+                    // InternalVampireLanguage.g:6872:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''

                     {

                     match('\''); 

-                    // InternalVampireLanguage.g:6842:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*

+                    // InternalVampireLanguage.g:6872:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*

                     loop15:

                     do {

                         int alt15=3;

@@ -2086,7 +2086,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                         switch (alt15) {

                         case 1 :

-                            // InternalVampireLanguage.g:6842:54: '\\\\' .

+                            // InternalVampireLanguage.g:6872:54: '\\\\' .

                             {

                             match('\\'); 

                             matchAny(); 

@@ -2094,7 +2094,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                             }

                             break;

                         case 2 :

-                            // InternalVampireLanguage.g:6842:61: ~ ( ( '\\\\' | '\\'' ) )

+                            // InternalVampireLanguage.g:6872:61: ~ ( ( '\\\\' | '\\'' ) )

                             {

                             if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {

                                 input.consume();

@@ -2137,12 +2137,12 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_ML_COMMENT;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6844:17: ( '/*' ( options {greedy=false; } : . )* '*/' )

-            // InternalVampireLanguage.g:6844:19: '/*' ( options {greedy=false; } : . )* '*/'

+            // InternalVampireLanguage.g:6874:17: ( '/*' ( options {greedy=false; } : . )* '*/' )

+            // InternalVampireLanguage.g:6874:19: '/*' ( options {greedy=false; } : . )* '*/'

             {

             match("/*"); 

 

-            // InternalVampireLanguage.g:6844:24: ( options {greedy=false; } : . )*

+            // InternalVampireLanguage.g:6874:24: ( options {greedy=false; } : . )*

             loop17:

             do {

                 int alt17=2;

@@ -2167,7 +2167,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt17) {

                 case 1 :

-                    // InternalVampireLanguage.g:6844:52: .

+                    // InternalVampireLanguage.g:6874:52: .

                     {

                     matchAny(); 

 

@@ -2197,12 +2197,12 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_SL_COMMENT;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6846:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )

-            // InternalVampireLanguage.g:6846:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?

+            // InternalVampireLanguage.g:6876:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )

+            // InternalVampireLanguage.g:6876:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?

             {

             match("//"); 

 

-            // InternalVampireLanguage.g:6846:24: (~ ( ( '\\n' | '\\r' ) ) )*

+            // InternalVampireLanguage.g:6876:24: (~ ( ( '\\n' | '\\r' ) ) )*

             loop18:

             do {

                 int alt18=2;

@@ -2215,7 +2215,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt18) {

                 case 1 :

-                    // InternalVampireLanguage.g:6846:24: ~ ( ( '\\n' | '\\r' ) )

+                    // InternalVampireLanguage.g:6876:24: ~ ( ( '\\n' | '\\r' ) )

                     {

                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {

                         input.consume();

@@ -2235,7 +2235,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                 }

             } while (true);

 

-            // InternalVampireLanguage.g:6846:40: ( ( '\\r' )? '\\n' )?

+            // InternalVampireLanguage.g:6876:40: ( ( '\\r' )? '\\n' )?

             int alt20=2;

             int LA20_0 = input.LA(1);

 

@@ -2244,9 +2244,9 @@ public class InternalVampireLanguageLexer extends Lexer {
             }

             switch (alt20) {

                 case 1 :

-                    // InternalVampireLanguage.g:6846:41: ( '\\r' )? '\\n'

+                    // InternalVampireLanguage.g:6876:41: ( '\\r' )? '\\n'

                     {

-                    // InternalVampireLanguage.g:6846:41: ( '\\r' )?

+                    // InternalVampireLanguage.g:6876:41: ( '\\r' )?

                     int alt19=2;

                     int LA19_0 = input.LA(1);

 

@@ -2255,7 +2255,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                     }

                     switch (alt19) {

                         case 1 :

-                            // InternalVampireLanguage.g:6846:41: '\\r'

+                            // InternalVampireLanguage.g:6876:41: '\\r'

                             {

                             match('\r'); 

 

@@ -2287,10 +2287,10 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_WS;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6848:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )

-            // InternalVampireLanguage.g:6848:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

+            // InternalVampireLanguage.g:6878:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )

+            // InternalVampireLanguage.g:6878:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

             {

-            // InternalVampireLanguage.g:6848:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

+            // InternalVampireLanguage.g:6878:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

             int cnt21=0;

             loop21:

             do {

@@ -2344,8 +2344,8 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_ANY_OTHER;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:6850:16: ( . )

-            // InternalVampireLanguage.g:6850:18: .

+            // InternalVampireLanguage.g:6880:16: ( . )

+            // InternalVampireLanguage.g:6880:18: .

             {

             matchAny(); 

 

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageParser.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageParser.java
index fefa9ff7..38a7d70f 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageParser.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/src-gen/ca/mcgill/ecse/dslreasoner/ide/contentassist/antlr/internal/InternalVampireLanguageParser.java
@@ -4414,12 +4414,12 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
             if ( (LA16_0==RULE_UPPER_WORD_ID) ) {

                 int LA16_1 = input.LA(2);

 

-                if ( (LA16_1==50||LA16_1==56) ) {

-                    alt16=1;

-                }

-                else if ( (LA16_1==61) ) {

+                if ( (LA16_1==61) ) {

                     alt16=2;

                 }

+                else if ( (LA16_1==50||LA16_1==56) ) {

+                    alt16=1;

+                }

                 else {

                     NoViableAltException nvae =

                         new NoViableAltException("", 16, 1, input);

@@ -10357,25 +10357,31 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSOtherDeclaration__Group__0__Impl"

-    // InternalVampireLanguage.g:3188:1: rule__VLSOtherDeclaration__Group__0__Impl : ( ruleVLSAtomicConstant ) ;

+    // InternalVampireLanguage.g:3188:1: rule__VLSOtherDeclaration__Group__0__Impl : ( ( rule__VLSOtherDeclaration__NameAssignment_0 ) ) ;

     public final void rule__VLSOtherDeclaration__Group__0__Impl() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:3192:1: ( ( ruleVLSAtomicConstant ) )

-            // InternalVampireLanguage.g:3193:1: ( ruleVLSAtomicConstant )

+            // InternalVampireLanguage.g:3192:1: ( ( ( rule__VLSOtherDeclaration__NameAssignment_0 ) ) )

+            // InternalVampireLanguage.g:3193:1: ( ( rule__VLSOtherDeclaration__NameAssignment_0 ) )

             {

-            // InternalVampireLanguage.g:3193:1: ( ruleVLSAtomicConstant )

-            // InternalVampireLanguage.g:3194:2: ruleVLSAtomicConstant

+            // InternalVampireLanguage.g:3193:1: ( ( rule__VLSOtherDeclaration__NameAssignment_0 ) )

+            // InternalVampireLanguage.g:3194:2: ( rule__VLSOtherDeclaration__NameAssignment_0 )

+            {

+             before(grammarAccess.getVLSOtherDeclarationAccess().getNameAssignment_0()); 

+            // InternalVampireLanguage.g:3195:2: ( rule__VLSOtherDeclaration__NameAssignment_0 )

+            // InternalVampireLanguage.g:3195:3: rule__VLSOtherDeclaration__NameAssignment_0

             {

-             before(grammarAccess.getVLSOtherDeclarationAccess().getVLSAtomicConstantParserRuleCall_0()); 

             pushFollow(FOLLOW_2);

-            ruleVLSAtomicConstant();

+            rule__VLSOtherDeclaration__NameAssignment_0();

 

             state._fsp--;

 

-             after(grammarAccess.getVLSOtherDeclarationAccess().getVLSAtomicConstantParserRuleCall_0()); 

+

+            }

+

+             after(grammarAccess.getVLSOtherDeclarationAccess().getNameAssignment_0()); 

 

             }

 

@@ -10591,25 +10597,31 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSVariableDeclaration__Group__0__Impl"

-    // InternalVampireLanguage.g:3269:1: rule__VLSVariableDeclaration__Group__0__Impl : ( ruleVLSVariable ) ;

+    // InternalVampireLanguage.g:3269:1: rule__VLSVariableDeclaration__Group__0__Impl : ( ( rule__VLSVariableDeclaration__NameAssignment_0 ) ) ;

     public final void rule__VLSVariableDeclaration__Group__0__Impl() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:3273:1: ( ( ruleVLSVariable ) )

-            // InternalVampireLanguage.g:3274:1: ( ruleVLSVariable )

+            // InternalVampireLanguage.g:3273:1: ( ( ( rule__VLSVariableDeclaration__NameAssignment_0 ) ) )

+            // InternalVampireLanguage.g:3274:1: ( ( rule__VLSVariableDeclaration__NameAssignment_0 ) )

+            {

+            // InternalVampireLanguage.g:3274:1: ( ( rule__VLSVariableDeclaration__NameAssignment_0 ) )

+            // InternalVampireLanguage.g:3275:2: ( rule__VLSVariableDeclaration__NameAssignment_0 )

             {

-            // InternalVampireLanguage.g:3274:1: ( ruleVLSVariable )

-            // InternalVampireLanguage.g:3275:2: ruleVLSVariable

+             before(grammarAccess.getVLSVariableDeclarationAccess().getNameAssignment_0()); 

+            // InternalVampireLanguage.g:3276:2: ( rule__VLSVariableDeclaration__NameAssignment_0 )

+            // InternalVampireLanguage.g:3276:3: rule__VLSVariableDeclaration__NameAssignment_0

             {

-             before(grammarAccess.getVLSVariableDeclarationAccess().getVLSVariableParserRuleCall_0()); 

             pushFollow(FOLLOW_2);

-            ruleVLSVariable();

+            rule__VLSVariableDeclaration__NameAssignment_0();

 

             state._fsp--;

 

-             after(grammarAccess.getVLSVariableDeclarationAccess().getVLSVariableParserRuleCall_0()); 

+

+            }

+

+             after(grammarAccess.getVLSVariableDeclarationAccess().getNameAssignment_0()); 

 

             }

 

@@ -19539,18 +19551,59 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
     // $ANTLR end "rule__VLSAnnotationTerms__TermsAssignment_1_1"

 

 

+    // $ANTLR start "rule__VLSOtherDeclaration__NameAssignment_0"

+    // InternalVampireLanguage.g:6362:1: rule__VLSOtherDeclaration__NameAssignment_0 : ( ruleVLSAtomicConstant ) ;

+    public final void rule__VLSOtherDeclaration__NameAssignment_0() throws RecognitionException {

+

+                        int stackSize = keepStackSize();

+                

+        try {

+            // InternalVampireLanguage.g:6366:1: ( ( ruleVLSAtomicConstant ) )

+            // InternalVampireLanguage.g:6367:2: ( ruleVLSAtomicConstant )

+            {

+            // InternalVampireLanguage.g:6367:2: ( ruleVLSAtomicConstant )

+            // InternalVampireLanguage.g:6368:3: ruleVLSAtomicConstant

+            {

+             before(grammarAccess.getVLSOtherDeclarationAccess().getNameVLSAtomicConstantParserRuleCall_0_0()); 

+            pushFollow(FOLLOW_2);

+            ruleVLSAtomicConstant();

+

+            state._fsp--;

+

+             after(grammarAccess.getVLSOtherDeclarationAccess().getNameVLSAtomicConstantParserRuleCall_0_0()); 

+

+            }

+

+

+            }

+

+        }

+        catch (RecognitionException re) {

+            reportError(re);

+            recover(input,re);

+        }

+        finally {

+

+                restoreStackSize(stackSize);

+

+        }

+        return ;

+    }

+    // $ANTLR end "rule__VLSOtherDeclaration__NameAssignment_0"

+

+

     // $ANTLR start "rule__VLSOtherDeclaration__TypeAssignment_2"

-    // InternalVampireLanguage.g:6362:1: rule__VLSOtherDeclaration__TypeAssignment_2 : ( ruleVLSTypeDef ) ;

+    // InternalVampireLanguage.g:6377:1: rule__VLSOtherDeclaration__TypeAssignment_2 : ( ruleVLSTypeDef ) ;

     public final void rule__VLSOtherDeclaration__TypeAssignment_2() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6366:1: ( ( ruleVLSTypeDef ) )

-            // InternalVampireLanguage.g:6367:2: ( ruleVLSTypeDef )

+            // InternalVampireLanguage.g:6381:1: ( ( ruleVLSTypeDef ) )

+            // InternalVampireLanguage.g:6382:2: ( ruleVLSTypeDef )

             {

-            // InternalVampireLanguage.g:6367:2: ( ruleVLSTypeDef )

-            // InternalVampireLanguage.g:6368:3: ruleVLSTypeDef

+            // InternalVampireLanguage.g:6382:2: ( ruleVLSTypeDef )

+            // InternalVampireLanguage.g:6383:3: ruleVLSTypeDef

             {

              before(grammarAccess.getVLSOtherDeclarationAccess().getTypeVLSTypeDefParserRuleCall_2_0()); 

             pushFollow(FOLLOW_2);

@@ -19580,18 +19633,59 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
     // $ANTLR end "rule__VLSOtherDeclaration__TypeAssignment_2"

 

 

+    // $ANTLR start "rule__VLSVariableDeclaration__NameAssignment_0"

+    // InternalVampireLanguage.g:6392:1: rule__VLSVariableDeclaration__NameAssignment_0 : ( ruleVLSVariable ) ;

+    public final void rule__VLSVariableDeclaration__NameAssignment_0() throws RecognitionException {

+

+                        int stackSize = keepStackSize();

+                

+        try {

+            // InternalVampireLanguage.g:6396:1: ( ( ruleVLSVariable ) )

+            // InternalVampireLanguage.g:6397:2: ( ruleVLSVariable )

+            {

+            // InternalVampireLanguage.g:6397:2: ( ruleVLSVariable )

+            // InternalVampireLanguage.g:6398:3: ruleVLSVariable

+            {

+             before(grammarAccess.getVLSVariableDeclarationAccess().getNameVLSVariableParserRuleCall_0_0()); 

+            pushFollow(FOLLOW_2);

+            ruleVLSVariable();

+

+            state._fsp--;

+

+             after(grammarAccess.getVLSVariableDeclarationAccess().getNameVLSVariableParserRuleCall_0_0()); 

+

+            }

+

+

+            }

+

+        }

+        catch (RecognitionException re) {

+            reportError(re);

+            recover(input,re);

+        }

+        finally {

+

+                restoreStackSize(stackSize);

+

+        }

+        return ;

+    }

+    // $ANTLR end "rule__VLSVariableDeclaration__NameAssignment_0"

+

+

     // $ANTLR start "rule__VLSVariableDeclaration__TypeAssignment_2"

-    // InternalVampireLanguage.g:6377:1: rule__VLSVariableDeclaration__TypeAssignment_2 : ( ruleVLSTypeDef ) ;

+    // InternalVampireLanguage.g:6407:1: rule__VLSVariableDeclaration__TypeAssignment_2 : ( ruleVLSTypeDef ) ;

     public final void rule__VLSVariableDeclaration__TypeAssignment_2() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6381:1: ( ( ruleVLSTypeDef ) )

-            // InternalVampireLanguage.g:6382:2: ( ruleVLSTypeDef )

+            // InternalVampireLanguage.g:6411:1: ( ( ruleVLSTypeDef ) )

+            // InternalVampireLanguage.g:6412:2: ( ruleVLSTypeDef )

             {

-            // InternalVampireLanguage.g:6382:2: ( ruleVLSTypeDef )

-            // InternalVampireLanguage.g:6383:3: ruleVLSTypeDef

+            // InternalVampireLanguage.g:6412:2: ( ruleVLSTypeDef )

+            // InternalVampireLanguage.g:6413:3: ruleVLSTypeDef

             {

              before(grammarAccess.getVLSVariableDeclarationAccess().getTypeVLSTypeDefParserRuleCall_2_0()); 

             pushFollow(FOLLOW_2);

@@ -19622,17 +19716,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSTypeDef__TypeSigAssignment_0"

-    // InternalVampireLanguage.g:6392:1: rule__VLSTypeDef__TypeSigAssignment_0 : ( ruleVLSUnitaryTerm ) ;

+    // InternalVampireLanguage.g:6422:1: rule__VLSTypeDef__TypeSigAssignment_0 : ( ruleVLSUnitaryTerm ) ;

     public final void rule__VLSTypeDef__TypeSigAssignment_0() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6396:1: ( ( ruleVLSUnitaryTerm ) )

-            // InternalVampireLanguage.g:6397:2: ( ruleVLSUnitaryTerm )

+            // InternalVampireLanguage.g:6426:1: ( ( ruleVLSUnitaryTerm ) )

+            // InternalVampireLanguage.g:6427:2: ( ruleVLSUnitaryTerm )

             {

-            // InternalVampireLanguage.g:6397:2: ( ruleVLSUnitaryTerm )

-            // InternalVampireLanguage.g:6398:3: ruleVLSUnitaryTerm

+            // InternalVampireLanguage.g:6427:2: ( ruleVLSUnitaryTerm )

+            // InternalVampireLanguage.g:6428:3: ruleVLSUnitaryTerm

             {

              before(grammarAccess.getVLSTypeDefAccess().getTypeSigVLSUnitaryTermParserRuleCall_0_0()); 

             pushFollow(FOLLOW_2);

@@ -19663,17 +19757,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSTypeDef__MapsToAssignment_1_1"

-    // InternalVampireLanguage.g:6407:1: rule__VLSTypeDef__MapsToAssignment_1_1 : ( ruleVLSAtomicConstant ) ;

+    // InternalVampireLanguage.g:6437:1: rule__VLSTypeDef__MapsToAssignment_1_1 : ( ruleVLSAtomicConstant ) ;

     public final void rule__VLSTypeDef__MapsToAssignment_1_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6411:1: ( ( ruleVLSAtomicConstant ) )

-            // InternalVampireLanguage.g:6412:2: ( ruleVLSAtomicConstant )

+            // InternalVampireLanguage.g:6441:1: ( ( ruleVLSAtomicConstant ) )

+            // InternalVampireLanguage.g:6442:2: ( ruleVLSAtomicConstant )

             {

-            // InternalVampireLanguage.g:6412:2: ( ruleVLSAtomicConstant )

-            // InternalVampireLanguage.g:6413:3: ruleVLSAtomicConstant

+            // InternalVampireLanguage.g:6442:2: ( ruleVLSAtomicConstant )

+            // InternalVampireLanguage.g:6443:3: ruleVLSAtomicConstant

             {

              before(grammarAccess.getVLSTypeDefAccess().getMapsToVLSAtomicConstantParserRuleCall_1_1_0()); 

             pushFollow(FOLLOW_2);

@@ -19704,17 +19798,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSUnitaryTerm__InitTypeAssignment_0"

-    // InternalVampireLanguage.g:6422:1: rule__VLSUnitaryTerm__InitTypeAssignment_0 : ( ruleVLSAtomic ) ;

+    // InternalVampireLanguage.g:6452:1: rule__VLSUnitaryTerm__InitTypeAssignment_0 : ( ruleVLSAtomic ) ;

     public final void rule__VLSUnitaryTerm__InitTypeAssignment_0() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6426:1: ( ( ruleVLSAtomic ) )

-            // InternalVampireLanguage.g:6427:2: ( ruleVLSAtomic )

+            // InternalVampireLanguage.g:6456:1: ( ( ruleVLSAtomic ) )

+            // InternalVampireLanguage.g:6457:2: ( ruleVLSAtomic )

             {

-            // InternalVampireLanguage.g:6427:2: ( ruleVLSAtomic )

-            // InternalVampireLanguage.g:6428:3: ruleVLSAtomic

+            // InternalVampireLanguage.g:6457:2: ( ruleVLSAtomic )

+            // InternalVampireLanguage.g:6458:3: ruleVLSAtomic

             {

              before(grammarAccess.getVLSUnitaryTermAccess().getInitTypeVLSAtomicParserRuleCall_0_0()); 

             pushFollow(FOLLOW_2);

@@ -19745,17 +19839,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSUnitaryTerm__NextTypeAssignment_1_1"

-    // InternalVampireLanguage.g:6437:1: rule__VLSUnitaryTerm__NextTypeAssignment_1_1 : ( ruleVLSAtomicConstant ) ;

+    // InternalVampireLanguage.g:6467:1: rule__VLSUnitaryTerm__NextTypeAssignment_1_1 : ( ruleVLSAtomicConstant ) ;

     public final void rule__VLSUnitaryTerm__NextTypeAssignment_1_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6441:1: ( ( ruleVLSAtomicConstant ) )

-            // InternalVampireLanguage.g:6442:2: ( ruleVLSAtomicConstant )

+            // InternalVampireLanguage.g:6471:1: ( ( ruleVLSAtomicConstant ) )

+            // InternalVampireLanguage.g:6472:2: ( ruleVLSAtomicConstant )

             {

-            // InternalVampireLanguage.g:6442:2: ( ruleVLSAtomicConstant )

-            // InternalVampireLanguage.g:6443:3: ruleVLSAtomicConstant

+            // InternalVampireLanguage.g:6472:2: ( ruleVLSAtomicConstant )

+            // InternalVampireLanguage.g:6473:3: ruleVLSAtomicConstant

             {

              before(grammarAccess.getVLSUnitaryTermAccess().getNextTypeVLSAtomicConstantParserRuleCall_1_1_0()); 

             pushFollow(FOLLOW_2);

@@ -19786,17 +19880,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSBinary__RightAssignment_1_0_1"

-    // InternalVampireLanguage.g:6452:1: rule__VLSBinary__RightAssignment_1_0_1 : ( ruleVLSUnitaryFormula ) ;

+    // InternalVampireLanguage.g:6482:1: rule__VLSBinary__RightAssignment_1_0_1 : ( ruleVLSUnitaryFormula ) ;

     public final void rule__VLSBinary__RightAssignment_1_0_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6456:1: ( ( ruleVLSUnitaryFormula ) )

-            // InternalVampireLanguage.g:6457:2: ( ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:6486:1: ( ( ruleVLSUnitaryFormula ) )

+            // InternalVampireLanguage.g:6487:2: ( ruleVLSUnitaryFormula )

             {

-            // InternalVampireLanguage.g:6457:2: ( ruleVLSUnitaryFormula )

-            // InternalVampireLanguage.g:6458:3: ruleVLSUnitaryFormula

+            // InternalVampireLanguage.g:6487:2: ( ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:6488:3: ruleVLSUnitaryFormula

             {

              before(grammarAccess.getVLSBinaryAccess().getRightVLSUnitaryFormulaParserRuleCall_1_0_1_0()); 

             pushFollow(FOLLOW_2);

@@ -19827,17 +19921,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSBinary__RightAssignment_1_1_2"

-    // InternalVampireLanguage.g:6467:1: rule__VLSBinary__RightAssignment_1_1_2 : ( ruleVLSUnitaryFormula ) ;

+    // InternalVampireLanguage.g:6497:1: rule__VLSBinary__RightAssignment_1_1_2 : ( ruleVLSUnitaryFormula ) ;

     public final void rule__VLSBinary__RightAssignment_1_1_2() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6471:1: ( ( ruleVLSUnitaryFormula ) )

-            // InternalVampireLanguage.g:6472:2: ( ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:6501:1: ( ( ruleVLSUnitaryFormula ) )

+            // InternalVampireLanguage.g:6502:2: ( ruleVLSUnitaryFormula )

             {

-            // InternalVampireLanguage.g:6472:2: ( ruleVLSUnitaryFormula )

-            // InternalVampireLanguage.g:6473:3: ruleVLSUnitaryFormula

+            // InternalVampireLanguage.g:6502:2: ( ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:6503:3: ruleVLSUnitaryFormula

             {

              before(grammarAccess.getVLSBinaryAccess().getRightVLSUnitaryFormulaParserRuleCall_1_1_2_0()); 

             pushFollow(FOLLOW_2);

@@ -19868,17 +19962,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSBinary__RightAssignment_1_2_2"

-    // InternalVampireLanguage.g:6482:1: rule__VLSBinary__RightAssignment_1_2_2 : ( ruleVLSUnitaryFormula ) ;

+    // InternalVampireLanguage.g:6512:1: rule__VLSBinary__RightAssignment_1_2_2 : ( ruleVLSUnitaryFormula ) ;

     public final void rule__VLSBinary__RightAssignment_1_2_2() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6486:1: ( ( ruleVLSUnitaryFormula ) )

-            // InternalVampireLanguage.g:6487:2: ( ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:6516:1: ( ( ruleVLSUnitaryFormula ) )

+            // InternalVampireLanguage.g:6517:2: ( ruleVLSUnitaryFormula )

             {

-            // InternalVampireLanguage.g:6487:2: ( ruleVLSUnitaryFormula )

-            // InternalVampireLanguage.g:6488:3: ruleVLSUnitaryFormula

+            // InternalVampireLanguage.g:6517:2: ( ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:6518:3: ruleVLSUnitaryFormula

             {

              before(grammarAccess.getVLSBinaryAccess().getRightVLSUnitaryFormulaParserRuleCall_1_2_2_0()); 

             pushFollow(FOLLOW_2);

@@ -19909,21 +20003,21 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSUniversalQuantifier__VariablesAssignment_1_2"

-    // InternalVampireLanguage.g:6497:1: rule__VLSUniversalQuantifier__VariablesAssignment_1_2 : ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0 ) ) ;

+    // InternalVampireLanguage.g:6527:1: rule__VLSUniversalQuantifier__VariablesAssignment_1_2 : ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0 ) ) ;

     public final void rule__VLSUniversalQuantifier__VariablesAssignment_1_2() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6501:1: ( ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0 ) ) )

-            // InternalVampireLanguage.g:6502:2: ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0 ) )

+            // InternalVampireLanguage.g:6531:1: ( ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0 ) ) )

+            // InternalVampireLanguage.g:6532:2: ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0 ) )

             {

-            // InternalVampireLanguage.g:6502:2: ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0 ) )

-            // InternalVampireLanguage.g:6503:3: ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0 )

+            // InternalVampireLanguage.g:6532:2: ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0 ) )

+            // InternalVampireLanguage.g:6533:3: ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0 )

             {

              before(grammarAccess.getVLSUniversalQuantifierAccess().getVariablesAlternatives_1_2_0()); 

-            // InternalVampireLanguage.g:6504:3: ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0 )

-            // InternalVampireLanguage.g:6504:4: rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0

+            // InternalVampireLanguage.g:6534:3: ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0 )

+            // InternalVampireLanguage.g:6534:4: rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0

             {

             pushFollow(FOLLOW_2);

             rule__VLSUniversalQuantifier__VariablesAlternatives_1_2_0();

@@ -19956,21 +20050,21 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSUniversalQuantifier__VariablesAssignment_1_3_1"

-    // InternalVampireLanguage.g:6512:1: rule__VLSUniversalQuantifier__VariablesAssignment_1_3_1 : ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0 ) ) ;

+    // InternalVampireLanguage.g:6542:1: rule__VLSUniversalQuantifier__VariablesAssignment_1_3_1 : ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0 ) ) ;

     public final void rule__VLSUniversalQuantifier__VariablesAssignment_1_3_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6516:1: ( ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0 ) ) )

-            // InternalVampireLanguage.g:6517:2: ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0 ) )

+            // InternalVampireLanguage.g:6546:1: ( ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0 ) ) )

+            // InternalVampireLanguage.g:6547:2: ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0 ) )

             {

-            // InternalVampireLanguage.g:6517:2: ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0 ) )

-            // InternalVampireLanguage.g:6518:3: ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0 )

+            // InternalVampireLanguage.g:6547:2: ( ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0 ) )

+            // InternalVampireLanguage.g:6548:3: ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0 )

             {

              before(grammarAccess.getVLSUniversalQuantifierAccess().getVariablesAlternatives_1_3_1_0()); 

-            // InternalVampireLanguage.g:6519:3: ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0 )

-            // InternalVampireLanguage.g:6519:4: rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0

+            // InternalVampireLanguage.g:6549:3: ( rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0 )

+            // InternalVampireLanguage.g:6549:4: rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0

             {

             pushFollow(FOLLOW_2);

             rule__VLSUniversalQuantifier__VariablesAlternatives_1_3_1_0();

@@ -20003,17 +20097,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSUniversalQuantifier__OperandAssignment_2"

-    // InternalVampireLanguage.g:6527:1: rule__VLSUniversalQuantifier__OperandAssignment_2 : ( ruleVLSUnitaryFormula ) ;

+    // InternalVampireLanguage.g:6557:1: rule__VLSUniversalQuantifier__OperandAssignment_2 : ( ruleVLSUnitaryFormula ) ;

     public final void rule__VLSUniversalQuantifier__OperandAssignment_2() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6531:1: ( ( ruleVLSUnitaryFormula ) )

-            // InternalVampireLanguage.g:6532:2: ( ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:6561:1: ( ( ruleVLSUnitaryFormula ) )

+            // InternalVampireLanguage.g:6562:2: ( ruleVLSUnitaryFormula )

             {

-            // InternalVampireLanguage.g:6532:2: ( ruleVLSUnitaryFormula )

-            // InternalVampireLanguage.g:6533:3: ruleVLSUnitaryFormula

+            // InternalVampireLanguage.g:6562:2: ( ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:6563:3: ruleVLSUnitaryFormula

             {

              before(grammarAccess.getVLSUniversalQuantifierAccess().getOperandVLSUnitaryFormulaParserRuleCall_2_0()); 

             pushFollow(FOLLOW_2);

@@ -20044,21 +20138,21 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSExistentialQuantifier__VariablesAssignment_1_2"

-    // InternalVampireLanguage.g:6542:1: rule__VLSExistentialQuantifier__VariablesAssignment_1_2 : ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0 ) ) ;

+    // InternalVampireLanguage.g:6572:1: rule__VLSExistentialQuantifier__VariablesAssignment_1_2 : ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0 ) ) ;

     public final void rule__VLSExistentialQuantifier__VariablesAssignment_1_2() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6546:1: ( ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0 ) ) )

-            // InternalVampireLanguage.g:6547:2: ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0 ) )

+            // InternalVampireLanguage.g:6576:1: ( ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0 ) ) )

+            // InternalVampireLanguage.g:6577:2: ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0 ) )

             {

-            // InternalVampireLanguage.g:6547:2: ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0 ) )

-            // InternalVampireLanguage.g:6548:3: ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0 )

+            // InternalVampireLanguage.g:6577:2: ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0 ) )

+            // InternalVampireLanguage.g:6578:3: ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0 )

             {

              before(grammarAccess.getVLSExistentialQuantifierAccess().getVariablesAlternatives_1_2_0()); 

-            // InternalVampireLanguage.g:6549:3: ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0 )

-            // InternalVampireLanguage.g:6549:4: rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0

+            // InternalVampireLanguage.g:6579:3: ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0 )

+            // InternalVampireLanguage.g:6579:4: rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0

             {

             pushFollow(FOLLOW_2);

             rule__VLSExistentialQuantifier__VariablesAlternatives_1_2_0();

@@ -20091,21 +20185,21 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSExistentialQuantifier__VariablesAssignment_1_3_1"

-    // InternalVampireLanguage.g:6557:1: rule__VLSExistentialQuantifier__VariablesAssignment_1_3_1 : ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0 ) ) ;

+    // InternalVampireLanguage.g:6587:1: rule__VLSExistentialQuantifier__VariablesAssignment_1_3_1 : ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0 ) ) ;

     public final void rule__VLSExistentialQuantifier__VariablesAssignment_1_3_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6561:1: ( ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0 ) ) )

-            // InternalVampireLanguage.g:6562:2: ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0 ) )

+            // InternalVampireLanguage.g:6591:1: ( ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0 ) ) )

+            // InternalVampireLanguage.g:6592:2: ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0 ) )

             {

-            // InternalVampireLanguage.g:6562:2: ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0 ) )

-            // InternalVampireLanguage.g:6563:3: ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0 )

+            // InternalVampireLanguage.g:6592:2: ( ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0 ) )

+            // InternalVampireLanguage.g:6593:3: ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0 )

             {

              before(grammarAccess.getVLSExistentialQuantifierAccess().getVariablesAlternatives_1_3_1_0()); 

-            // InternalVampireLanguage.g:6564:3: ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0 )

-            // InternalVampireLanguage.g:6564:4: rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0

+            // InternalVampireLanguage.g:6594:3: ( rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0 )

+            // InternalVampireLanguage.g:6594:4: rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0

             {

             pushFollow(FOLLOW_2);

             rule__VLSExistentialQuantifier__VariablesAlternatives_1_3_1_0();

@@ -20138,17 +20232,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSExistentialQuantifier__OperandAssignment_2"

-    // InternalVampireLanguage.g:6572:1: rule__VLSExistentialQuantifier__OperandAssignment_2 : ( ruleVLSUnitaryFormula ) ;

+    // InternalVampireLanguage.g:6602:1: rule__VLSExistentialQuantifier__OperandAssignment_2 : ( ruleVLSUnitaryFormula ) ;

     public final void rule__VLSExistentialQuantifier__OperandAssignment_2() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6576:1: ( ( ruleVLSUnitaryFormula ) )

-            // InternalVampireLanguage.g:6577:2: ( ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:6606:1: ( ( ruleVLSUnitaryFormula ) )

+            // InternalVampireLanguage.g:6607:2: ( ruleVLSUnitaryFormula )

             {

-            // InternalVampireLanguage.g:6577:2: ( ruleVLSUnitaryFormula )

-            // InternalVampireLanguage.g:6578:3: ruleVLSUnitaryFormula

+            // InternalVampireLanguage.g:6607:2: ( ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:6608:3: ruleVLSUnitaryFormula

             {

              before(grammarAccess.getVLSExistentialQuantifierAccess().getOperandVLSUnitaryFormulaParserRuleCall_2_0()); 

             pushFollow(FOLLOW_2);

@@ -20179,17 +20273,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSUnaryNegation__OperandAssignment_2"

-    // InternalVampireLanguage.g:6587:1: rule__VLSUnaryNegation__OperandAssignment_2 : ( ruleVLSUnitaryFormula ) ;

+    // InternalVampireLanguage.g:6617:1: rule__VLSUnaryNegation__OperandAssignment_2 : ( ruleVLSUnitaryFormula ) ;

     public final void rule__VLSUnaryNegation__OperandAssignment_2() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6591:1: ( ( ruleVLSUnitaryFormula ) )

-            // InternalVampireLanguage.g:6592:2: ( ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:6621:1: ( ( ruleVLSUnitaryFormula ) )

+            // InternalVampireLanguage.g:6622:2: ( ruleVLSUnitaryFormula )

             {

-            // InternalVampireLanguage.g:6592:2: ( ruleVLSUnitaryFormula )

-            // InternalVampireLanguage.g:6593:3: ruleVLSUnitaryFormula

+            // InternalVampireLanguage.g:6622:2: ( ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:6623:3: ruleVLSUnitaryFormula

             {

              before(grammarAccess.getVLSUnaryNegationAccess().getOperandVLSUnitaryFormulaParserRuleCall_2_0()); 

             pushFollow(FOLLOW_2);

@@ -20220,17 +20314,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSUnaryInfix__RightAssignment_1_1"

-    // InternalVampireLanguage.g:6602:1: rule__VLSUnaryInfix__RightAssignment_1_1 : ( ruleVLSAtomic ) ;

+    // InternalVampireLanguage.g:6632:1: rule__VLSUnaryInfix__RightAssignment_1_1 : ( ruleVLSAtomic ) ;

     public final void rule__VLSUnaryInfix__RightAssignment_1_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6606:1: ( ( ruleVLSAtomic ) )

-            // InternalVampireLanguage.g:6607:2: ( ruleVLSAtomic )

+            // InternalVampireLanguage.g:6636:1: ( ( ruleVLSAtomic ) )

+            // InternalVampireLanguage.g:6637:2: ( ruleVLSAtomic )

             {

-            // InternalVampireLanguage.g:6607:2: ( ruleVLSAtomic )

-            // InternalVampireLanguage.g:6608:3: ruleVLSAtomic

+            // InternalVampireLanguage.g:6637:2: ( ruleVLSAtomic )

+            // InternalVampireLanguage.g:6638:3: ruleVLSAtomic

             {

              before(grammarAccess.getVLSUnaryInfixAccess().getRightVLSAtomicParserRuleCall_1_1_0()); 

             pushFollow(FOLLOW_2);

@@ -20261,21 +20355,21 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSAtomicConstant__NameAssignment_0_1"

-    // InternalVampireLanguage.g:6617:1: rule__VLSAtomicConstant__NameAssignment_0_1 : ( ( rule__VLSAtomicConstant__NameAlternatives_0_1_0 ) ) ;

+    // InternalVampireLanguage.g:6647:1: rule__VLSAtomicConstant__NameAssignment_0_1 : ( ( rule__VLSAtomicConstant__NameAlternatives_0_1_0 ) ) ;

     public final void rule__VLSAtomicConstant__NameAssignment_0_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6621:1: ( ( ( rule__VLSAtomicConstant__NameAlternatives_0_1_0 ) ) )

-            // InternalVampireLanguage.g:6622:2: ( ( rule__VLSAtomicConstant__NameAlternatives_0_1_0 ) )

+            // InternalVampireLanguage.g:6651:1: ( ( ( rule__VLSAtomicConstant__NameAlternatives_0_1_0 ) ) )

+            // InternalVampireLanguage.g:6652:2: ( ( rule__VLSAtomicConstant__NameAlternatives_0_1_0 ) )

             {

-            // InternalVampireLanguage.g:6622:2: ( ( rule__VLSAtomicConstant__NameAlternatives_0_1_0 ) )

-            // InternalVampireLanguage.g:6623:3: ( rule__VLSAtomicConstant__NameAlternatives_0_1_0 )

+            // InternalVampireLanguage.g:6652:2: ( ( rule__VLSAtomicConstant__NameAlternatives_0_1_0 ) )

+            // InternalVampireLanguage.g:6653:3: ( rule__VLSAtomicConstant__NameAlternatives_0_1_0 )

             {

              before(grammarAccess.getVLSAtomicConstantAccess().getNameAlternatives_0_1_0()); 

-            // InternalVampireLanguage.g:6624:3: ( rule__VLSAtomicConstant__NameAlternatives_0_1_0 )

-            // InternalVampireLanguage.g:6624:4: rule__VLSAtomicConstant__NameAlternatives_0_1_0

+            // InternalVampireLanguage.g:6654:3: ( rule__VLSAtomicConstant__NameAlternatives_0_1_0 )

+            // InternalVampireLanguage.g:6654:4: rule__VLSAtomicConstant__NameAlternatives_0_1_0

             {

             pushFollow(FOLLOW_2);

             rule__VLSAtomicConstant__NameAlternatives_0_1_0();

@@ -20308,21 +20402,21 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSAtomicFunction__ConstantAssignment_0_1"

-    // InternalVampireLanguage.g:6632:1: rule__VLSAtomicFunction__ConstantAssignment_0_1 : ( ( rule__VLSAtomicFunction__ConstantAlternatives_0_1_0 ) ) ;

+    // InternalVampireLanguage.g:6662:1: rule__VLSAtomicFunction__ConstantAssignment_0_1 : ( ( rule__VLSAtomicFunction__ConstantAlternatives_0_1_0 ) ) ;

     public final void rule__VLSAtomicFunction__ConstantAssignment_0_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6636:1: ( ( ( rule__VLSAtomicFunction__ConstantAlternatives_0_1_0 ) ) )

-            // InternalVampireLanguage.g:6637:2: ( ( rule__VLSAtomicFunction__ConstantAlternatives_0_1_0 ) )

+            // InternalVampireLanguage.g:6666:1: ( ( ( rule__VLSAtomicFunction__ConstantAlternatives_0_1_0 ) ) )

+            // InternalVampireLanguage.g:6667:2: ( ( rule__VLSAtomicFunction__ConstantAlternatives_0_1_0 ) )

             {

-            // InternalVampireLanguage.g:6637:2: ( ( rule__VLSAtomicFunction__ConstantAlternatives_0_1_0 ) )

-            // InternalVampireLanguage.g:6638:3: ( rule__VLSAtomicFunction__ConstantAlternatives_0_1_0 )

+            // InternalVampireLanguage.g:6667:2: ( ( rule__VLSAtomicFunction__ConstantAlternatives_0_1_0 ) )

+            // InternalVampireLanguage.g:6668:3: ( rule__VLSAtomicFunction__ConstantAlternatives_0_1_0 )

             {

              before(grammarAccess.getVLSAtomicFunctionAccess().getConstantAlternatives_0_1_0()); 

-            // InternalVampireLanguage.g:6639:3: ( rule__VLSAtomicFunction__ConstantAlternatives_0_1_0 )

-            // InternalVampireLanguage.g:6639:4: rule__VLSAtomicFunction__ConstantAlternatives_0_1_0

+            // InternalVampireLanguage.g:6669:3: ( rule__VLSAtomicFunction__ConstantAlternatives_0_1_0 )

+            // InternalVampireLanguage.g:6669:4: rule__VLSAtomicFunction__ConstantAlternatives_0_1_0

             {

             pushFollow(FOLLOW_2);

             rule__VLSAtomicFunction__ConstantAlternatives_0_1_0();

@@ -20355,17 +20449,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSAtomicFunction__TermsAssignment_0_2_1"

-    // InternalVampireLanguage.g:6647:1: rule__VLSAtomicFunction__TermsAssignment_0_2_1 : ( ruleVLSFofTerm ) ;

+    // InternalVampireLanguage.g:6677:1: rule__VLSAtomicFunction__TermsAssignment_0_2_1 : ( ruleVLSFofTerm ) ;

     public final void rule__VLSAtomicFunction__TermsAssignment_0_2_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6651:1: ( ( ruleVLSFofTerm ) )

-            // InternalVampireLanguage.g:6652:2: ( ruleVLSFofTerm )

+            // InternalVampireLanguage.g:6681:1: ( ( ruleVLSFofTerm ) )

+            // InternalVampireLanguage.g:6682:2: ( ruleVLSFofTerm )

             {

-            // InternalVampireLanguage.g:6652:2: ( ruleVLSFofTerm )

-            // InternalVampireLanguage.g:6653:3: ruleVLSFofTerm

+            // InternalVampireLanguage.g:6682:2: ( ruleVLSFofTerm )

+            // InternalVampireLanguage.g:6683:3: ruleVLSFofTerm

             {

              before(grammarAccess.getVLSAtomicFunctionAccess().getTermsVLSFofTermParserRuleCall_0_2_1_0()); 

             pushFollow(FOLLOW_2);

@@ -20396,17 +20490,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSAtomicFunction__TermsAssignment_0_2_2_1"

-    // InternalVampireLanguage.g:6662:1: rule__VLSAtomicFunction__TermsAssignment_0_2_2_1 : ( ruleVLSFofTerm ) ;

+    // InternalVampireLanguage.g:6692:1: rule__VLSAtomicFunction__TermsAssignment_0_2_2_1 : ( ruleVLSFofTerm ) ;

     public final void rule__VLSAtomicFunction__TermsAssignment_0_2_2_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6666:1: ( ( ruleVLSFofTerm ) )

-            // InternalVampireLanguage.g:6667:2: ( ruleVLSFofTerm )

+            // InternalVampireLanguage.g:6696:1: ( ( ruleVLSFofTerm ) )

+            // InternalVampireLanguage.g:6697:2: ( ruleVLSFofTerm )

             {

-            // InternalVampireLanguage.g:6667:2: ( ruleVLSFofTerm )

-            // InternalVampireLanguage.g:6668:3: ruleVLSFofTerm

+            // InternalVampireLanguage.g:6697:2: ( ruleVLSFofTerm )

+            // InternalVampireLanguage.g:6698:3: ruleVLSFofTerm

             {

              before(grammarAccess.getVLSAtomicFunctionAccess().getTermsVLSFofTermParserRuleCall_0_2_2_1_0()); 

             pushFollow(FOLLOW_2);

@@ -20437,21 +20531,21 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSAtomicFunction__NameAssignment_1_1"

-    // InternalVampireLanguage.g:6677:1: rule__VLSAtomicFunction__NameAssignment_1_1 : ( ( '$less' ) ) ;

+    // InternalVampireLanguage.g:6707:1: rule__VLSAtomicFunction__NameAssignment_1_1 : ( ( '$less' ) ) ;

     public final void rule__VLSAtomicFunction__NameAssignment_1_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6681:1: ( ( ( '$less' ) ) )

-            // InternalVampireLanguage.g:6682:2: ( ( '$less' ) )

+            // InternalVampireLanguage.g:6711:1: ( ( ( '$less' ) ) )

+            // InternalVampireLanguage.g:6712:2: ( ( '$less' ) )

             {

-            // InternalVampireLanguage.g:6682:2: ( ( '$less' ) )

-            // InternalVampireLanguage.g:6683:3: ( '$less' )

+            // InternalVampireLanguage.g:6712:2: ( ( '$less' ) )

+            // InternalVampireLanguage.g:6713:3: ( '$less' )

             {

              before(grammarAccess.getVLSAtomicFunctionAccess().getNameLessKeyword_1_1_0()); 

-            // InternalVampireLanguage.g:6684:3: ( '$less' )

-            // InternalVampireLanguage.g:6685:4: '$less'

+            // InternalVampireLanguage.g:6714:3: ( '$less' )

+            // InternalVampireLanguage.g:6715:4: '$less'

             {

              before(grammarAccess.getVLSAtomicFunctionAccess().getNameLessKeyword_1_1_0()); 

             match(input,80,FOLLOW_2); 

@@ -20482,17 +20576,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSAtomicFunction__TermsAssignment_1_3"

-    // InternalVampireLanguage.g:6696:1: rule__VLSAtomicFunction__TermsAssignment_1_3 : ( ruleVLSFofTerm ) ;

+    // InternalVampireLanguage.g:6726:1: rule__VLSAtomicFunction__TermsAssignment_1_3 : ( ruleVLSFofTerm ) ;

     public final void rule__VLSAtomicFunction__TermsAssignment_1_3() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6700:1: ( ( ruleVLSFofTerm ) )

-            // InternalVampireLanguage.g:6701:2: ( ruleVLSFofTerm )

+            // InternalVampireLanguage.g:6730:1: ( ( ruleVLSFofTerm ) )

+            // InternalVampireLanguage.g:6731:2: ( ruleVLSFofTerm )

             {

-            // InternalVampireLanguage.g:6701:2: ( ruleVLSFofTerm )

-            // InternalVampireLanguage.g:6702:3: ruleVLSFofTerm

+            // InternalVampireLanguage.g:6731:2: ( ruleVLSFofTerm )

+            // InternalVampireLanguage.g:6732:3: ruleVLSFofTerm

             {

              before(grammarAccess.getVLSAtomicFunctionAccess().getTermsVLSFofTermParserRuleCall_1_3_0()); 

             pushFollow(FOLLOW_2);

@@ -20523,17 +20617,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSAtomicFunction__TermsAssignment_1_5"

-    // InternalVampireLanguage.g:6711:1: rule__VLSAtomicFunction__TermsAssignment_1_5 : ( ruleVLSFofTerm ) ;

+    // InternalVampireLanguage.g:6741:1: rule__VLSAtomicFunction__TermsAssignment_1_5 : ( ruleVLSFofTerm ) ;

     public final void rule__VLSAtomicFunction__TermsAssignment_1_5() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6715:1: ( ( ruleVLSFofTerm ) )

-            // InternalVampireLanguage.g:6716:2: ( ruleVLSFofTerm )

+            // InternalVampireLanguage.g:6745:1: ( ( ruleVLSFofTerm ) )

+            // InternalVampireLanguage.g:6746:2: ( ruleVLSFofTerm )

             {

-            // InternalVampireLanguage.g:6716:2: ( ruleVLSFofTerm )

-            // InternalVampireLanguage.g:6717:3: ruleVLSFofTerm

+            // InternalVampireLanguage.g:6746:2: ( ruleVLSFofTerm )

+            // InternalVampireLanguage.g:6747:3: ruleVLSFofTerm

             {

              before(grammarAccess.getVLSAtomicFunctionAccess().getTermsVLSFofTermParserRuleCall_1_5_0()); 

             pushFollow(FOLLOW_2);

@@ -20564,17 +20658,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSVariable__NameAssignment"

-    // InternalVampireLanguage.g:6726:1: rule__VLSVariable__NameAssignment : ( RULE_UPPER_WORD_ID ) ;

+    // InternalVampireLanguage.g:6756:1: rule__VLSVariable__NameAssignment : ( RULE_UPPER_WORD_ID ) ;

     public final void rule__VLSVariable__NameAssignment() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6730:1: ( ( RULE_UPPER_WORD_ID ) )

-            // InternalVampireLanguage.g:6731:2: ( RULE_UPPER_WORD_ID )

+            // InternalVampireLanguage.g:6760:1: ( ( RULE_UPPER_WORD_ID ) )

+            // InternalVampireLanguage.g:6761:2: ( RULE_UPPER_WORD_ID )

             {

-            // InternalVampireLanguage.g:6731:2: ( RULE_UPPER_WORD_ID )

-            // InternalVampireLanguage.g:6732:3: RULE_UPPER_WORD_ID

+            // InternalVampireLanguage.g:6761:2: ( RULE_UPPER_WORD_ID )

+            // InternalVampireLanguage.g:6762:3: RULE_UPPER_WORD_ID

             {

              before(grammarAccess.getVLSVariableAccess().getNameUPPER_WORD_IDTerminalRuleCall_0()); 

             match(input,RULE_UPPER_WORD_ID,FOLLOW_2); 

@@ -20601,21 +20695,21 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSFunctionAsTerm__FunctorAssignment_0"

-    // InternalVampireLanguage.g:6741:1: rule__VLSFunctionAsTerm__FunctorAssignment_0 : ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) ) ;

+    // InternalVampireLanguage.g:6771:1: rule__VLSFunctionAsTerm__FunctorAssignment_0 : ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) ) ;

     public final void rule__VLSFunctionAsTerm__FunctorAssignment_0() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6745:1: ( ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) ) )

-            // InternalVampireLanguage.g:6746:2: ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) )

+            // InternalVampireLanguage.g:6775:1: ( ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) ) )

+            // InternalVampireLanguage.g:6776:2: ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) )

             {

-            // InternalVampireLanguage.g:6746:2: ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) )

-            // InternalVampireLanguage.g:6747:3: ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 )

+            // InternalVampireLanguage.g:6776:2: ( ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 ) )

+            // InternalVampireLanguage.g:6777:3: ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 )

             {

              before(grammarAccess.getVLSFunctionAsTermAccess().getFunctorAlternatives_0_0()); 

-            // InternalVampireLanguage.g:6748:3: ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 )

-            // InternalVampireLanguage.g:6748:4: rule__VLSFunctionAsTerm__FunctorAlternatives_0_0

+            // InternalVampireLanguage.g:6778:3: ( rule__VLSFunctionAsTerm__FunctorAlternatives_0_0 )

+            // InternalVampireLanguage.g:6778:4: rule__VLSFunctionAsTerm__FunctorAlternatives_0_0

             {

             pushFollow(FOLLOW_2);

             rule__VLSFunctionAsTerm__FunctorAlternatives_0_0();

@@ -20648,17 +20742,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSFunctionAsTerm__TermsAssignment_1_1"

-    // InternalVampireLanguage.g:6756:1: rule__VLSFunctionAsTerm__TermsAssignment_1_1 : ( ruleVLSFofTerm ) ;

+    // InternalVampireLanguage.g:6786:1: rule__VLSFunctionAsTerm__TermsAssignment_1_1 : ( ruleVLSFofTerm ) ;

     public final void rule__VLSFunctionAsTerm__TermsAssignment_1_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6760:1: ( ( ruleVLSFofTerm ) )

-            // InternalVampireLanguage.g:6761:2: ( ruleVLSFofTerm )

+            // InternalVampireLanguage.g:6790:1: ( ( ruleVLSFofTerm ) )

+            // InternalVampireLanguage.g:6791:2: ( ruleVLSFofTerm )

             {

-            // InternalVampireLanguage.g:6761:2: ( ruleVLSFofTerm )

-            // InternalVampireLanguage.g:6762:3: ruleVLSFofTerm

+            // InternalVampireLanguage.g:6791:2: ( ruleVLSFofTerm )

+            // InternalVampireLanguage.g:6792:3: ruleVLSFofTerm

             {

              before(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_1_0()); 

             pushFollow(FOLLOW_2);

@@ -20689,17 +20783,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSFunctionAsTerm__TermsAssignment_1_2_1"

-    // InternalVampireLanguage.g:6771:1: rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 : ( ruleVLSFofTerm ) ;

+    // InternalVampireLanguage.g:6801:1: rule__VLSFunctionAsTerm__TermsAssignment_1_2_1 : ( ruleVLSFofTerm ) ;

     public final void rule__VLSFunctionAsTerm__TermsAssignment_1_2_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6775:1: ( ( ruleVLSFofTerm ) )

-            // InternalVampireLanguage.g:6776:2: ( ruleVLSFofTerm )

+            // InternalVampireLanguage.g:6805:1: ( ( ruleVLSFofTerm ) )

+            // InternalVampireLanguage.g:6806:2: ( ruleVLSFofTerm )

             {

-            // InternalVampireLanguage.g:6776:2: ( ruleVLSFofTerm )

-            // InternalVampireLanguage.g:6777:3: ruleVLSFofTerm

+            // InternalVampireLanguage.g:6806:2: ( ruleVLSFofTerm )

+            // InternalVampireLanguage.g:6807:3: ruleVLSFofTerm

             {

              before(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0()); 

             pushFollow(FOLLOW_2);

@@ -20730,17 +20824,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSDefinedTerm__ValueAssignment_0_1"

-    // InternalVampireLanguage.g:6786:1: rule__VLSDefinedTerm__ValueAssignment_0_1 : ( RULE_SIGNED_LITERAL ) ;

+    // InternalVampireLanguage.g:6816:1: rule__VLSDefinedTerm__ValueAssignment_0_1 : ( RULE_SIGNED_LITERAL ) ;

     public final void rule__VLSDefinedTerm__ValueAssignment_0_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6790:1: ( ( RULE_SIGNED_LITERAL ) )

-            // InternalVampireLanguage.g:6791:2: ( RULE_SIGNED_LITERAL )

+            // InternalVampireLanguage.g:6820:1: ( ( RULE_SIGNED_LITERAL ) )

+            // InternalVampireLanguage.g:6821:2: ( RULE_SIGNED_LITERAL )

             {

-            // InternalVampireLanguage.g:6791:2: ( RULE_SIGNED_LITERAL )

-            // InternalVampireLanguage.g:6792:3: RULE_SIGNED_LITERAL

+            // InternalVampireLanguage.g:6821:2: ( RULE_SIGNED_LITERAL )

+            // InternalVampireLanguage.g:6822:3: RULE_SIGNED_LITERAL

             {

              before(grammarAccess.getVLSDefinedTermAccess().getValueSIGNED_LITERALTerminalRuleCall_0_1_0()); 

             match(input,RULE_SIGNED_LITERAL,FOLLOW_2); 

@@ -20767,17 +20861,17 @@ public class InternalVampireLanguageParser extends AbstractInternalContentAssist
 

 

     // $ANTLR start "rule__VLSDefinedTerm__ValueAssignment_1_1"

-    // InternalVampireLanguage.g:6801:1: rule__VLSDefinedTerm__ValueAssignment_1_1 : ( RULE_DOUBLE_QUOTE ) ;

+    // InternalVampireLanguage.g:6831:1: rule__VLSDefinedTerm__ValueAssignment_1_1 : ( RULE_DOUBLE_QUOTE ) ;

     public final void rule__VLSDefinedTerm__ValueAssignment_1_1() throws RecognitionException {

 

                         int stackSize = keepStackSize();

                 

         try {

-            // InternalVampireLanguage.g:6805:1: ( ( RULE_DOUBLE_QUOTE ) )

-            // InternalVampireLanguage.g:6806:2: ( RULE_DOUBLE_QUOTE )

+            // InternalVampireLanguage.g:6835:1: ( ( RULE_DOUBLE_QUOTE ) )

+            // InternalVampireLanguage.g:6836:2: ( RULE_DOUBLE_QUOTE )

             {

-            // InternalVampireLanguage.g:6806:2: ( RULE_DOUBLE_QUOTE )

-            // InternalVampireLanguage.g:6807:3: RULE_DOUBLE_QUOTE

+            // InternalVampireLanguage.g:6836:2: ( RULE_DOUBLE_QUOTE )

+            // InternalVampireLanguage.g:6837:3: RULE_DOUBLE_QUOTE

             {

              before(grammarAccess.getVLSDefinedTermAccess().getValueDOUBLE_QUOTETerminalRuleCall_1_1_0()); 

             match(input,RULE_DOUBLE_QUOTE,FOLLOW_2); 

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java
index d22b57df..a76460ba 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/src-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/AbstractVampireLanguageProposalProvider.java
@@ -73,9 +73,15 @@ public abstract class AbstractVampireLanguageProposalProvider extends TerminalsP
         public void completeVLSAnnotationTerms_Terms(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);

         }

+        public void completeVLSOtherDeclaration_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);

+        }

         public void completeVLSOtherDeclaration_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);

         }

+        public void completeVLSVariableDeclaration_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

+                completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);

+        }

         public void completeVLSVariableDeclaration_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {

                 completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);

         }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
index c07947c9..32c4c595 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore
index 0018661e..1ba1bbf7 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.ecore
@@ -40,9 +40,18 @@
         eType="#//VLSAnnotation" containment="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="VLSTffTerm"/>

-  <eClassifiers xsi:type="ecore:EClass" name="VLSDeclaration" eSuperTypes="#//VLSTffTerm"/>

-  <eClassifiers xsi:type="ecore:EClass" name="VLSOtherDeclaration" eSuperTypes="#//VLSDeclaration"/>

-  <eClassifiers xsi:type="ecore:EClass" name="VLSVariableDeclaration" eSuperTypes="#//VLSDeclaration"/>

+  <eClassifiers xsi:type="ecore:EClass" name="VLSDeclaration" eSuperTypes="#//VLSTffTerm">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//VLSTypeDef"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="VLSOtherDeclaration" eSuperTypes="#//VLSDeclaration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="name" eType="#//VLSTerm"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="VLSVariableDeclaration" eSuperTypes="#//VLSDeclaration">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="name" eType="#//VLSVariable"

+        containment="true"/>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="VLSTypeDef">

     <eStructuralFeatures xsi:type="ecore:EReference" name="typeSig" eType="#//VLSTypeDef"

         containment="true"/>

@@ -53,11 +62,8 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="nextType" eType="#//VLSTerm"

         containment="true"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="VLSTerm" eSuperTypes="#//VLSTffTerm #//VLSOtherDeclaration">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//VLSTypeDef"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="VLSVariable" eSuperTypes="#//VLSVariableDeclaration #//VLSTerm">

+  <eClassifiers xsi:type="ecore:EClass" name="VLSTerm" eSuperTypes="#//VLSTffTerm"/>

+  <eClassifiers xsi:type="ecore:EClass" name="VLSVariable" eSuperTypes="#//VLSTerm">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="VLSFunctionAsTerm" eSuperTypes="#//VLSTerm">

@@ -124,13 +130,13 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="VLSUniversalQuantifier" eSuperTypes="#//VLSTerm">

     <eStructuralFeatures xsi:type="ecore:EReference" name="variables" upperBound="-1"

-        eType="#//VLSVariableDeclaration" containment="true"/>

+        eType="#//VLSTffTerm" containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="operand" eType="#//VLSTerm"

         containment="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="VLSExistentialQuantifier" eSuperTypes="#//VLSTerm">

     <eStructuralFeatures xsi:type="ecore:EReference" name="variables" upperBound="-1"

-        eType="#//VLSVariableDeclaration" containment="true"/>

+        eType="#//VLSTffTerm" containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="operand" eType="#//VLSTerm"

         containment="true"/>

   </eClassifiers>

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel
index e69b5c11..7800e85e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/model/generated/VampireLanguage.genmodel
@@ -34,18 +34,22 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSAnnotation/terms"/>

     </genClasses>

     <genClasses ecoreClass="VampireLanguage.ecore#//VLSTffTerm"/>

-    <genClasses ecoreClass="VampireLanguage.ecore#//VLSDeclaration"/>

-    <genClasses ecoreClass="VampireLanguage.ecore#//VLSOtherDeclaration"/>

-    <genClasses ecoreClass="VampireLanguage.ecore#//VLSVariableDeclaration"/>

+    <genClasses ecoreClass="VampireLanguage.ecore#//VLSDeclaration">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSDeclaration/type"/>

+    </genClasses>

+    <genClasses ecoreClass="VampireLanguage.ecore#//VLSOtherDeclaration">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSOtherDeclaration/name"/>

+    </genClasses>

+    <genClasses ecoreClass="VampireLanguage.ecore#//VLSVariableDeclaration">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSVariableDeclaration/name"/>

+    </genClasses>

     <genClasses ecoreClass="VampireLanguage.ecore#//VLSTypeDef">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSTypeDef/typeSig"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSTypeDef/mapsTo"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSTypeDef/initType"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSTypeDef/nextType"/>

     </genClasses>

-    <genClasses ecoreClass="VampireLanguage.ecore#//VLSTerm">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference VampireLanguage.ecore#//VLSTerm/type"/>

-    </genClasses>

+    <genClasses ecoreClass="VampireLanguage.ecore#//VLSTerm"/>

     <genClasses ecoreClass="VampireLanguage.ecore#//VLSVariable">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute VampireLanguage.ecore#//VLSVariable/name"/>

     </genClasses>

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtextbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtextbin
index cecbbe31..0b7b2a35 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtextbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/VampireLanguage.xtextbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguage.g b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguage.g
index 96bf62b2..6edaf50e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguage.g
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguage.g
@@ -1116,14 +1116,25 @@ ruleVLSOtherDeclaration returns [EObject current=null]
         leaveRule();

 }:

         (

-                {

-                        newCompositeNode(grammarAccess.getVLSOtherDeclarationAccess().getVLSAtomicConstantParserRuleCall_0());

-                }

-                this_VLSAtomicConstant_0=ruleVLSAtomicConstant

-                {

-                        $current = $this_VLSAtomicConstant_0.current;

-                        afterParserOrEnumRuleCall();

-                }

+                (

+                        (

+                                {

+                                        newCompositeNode(grammarAccess.getVLSOtherDeclarationAccess().getNameVLSAtomicConstantParserRuleCall_0_0());

+                                }

+                                lv_name_0_0=ruleVLSAtomicConstant

+                                {

+                                        if ($current==null) {

+                                                $current = createModelElementForParent(grammarAccess.getVLSOtherDeclarationRule());

+                                        }

+                                        set(

+                                                $current,

+                                                "name",

+                                                lv_name_0_0,

+                                                "ca.mcgill.ecse.dslreasoner.VampireLanguage.VLSAtomicConstant");

+                                        afterParserOrEnumRuleCall();

+                                }

+                        )

+                )

                 otherlv_1=':'

                 {

                         newLeafNode(otherlv_1, grammarAccess.getVLSOtherDeclarationAccess().getColonKeyword_1());

@@ -1166,14 +1177,25 @@ ruleVLSVariableDeclaration returns [EObject current=null]
         leaveRule();

 }:

         (

-                {

-                        newCompositeNode(grammarAccess.getVLSVariableDeclarationAccess().getVLSVariableParserRuleCall_0());

-                }

-                this_VLSVariable_0=ruleVLSVariable

-                {

-                        $current = $this_VLSVariable_0.current;

-                        afterParserOrEnumRuleCall();

-                }

+                (

+                        (

+                                {

+                                        newCompositeNode(grammarAccess.getVLSVariableDeclarationAccess().getNameVLSVariableParserRuleCall_0_0());

+                                }

+                                lv_name_0_0=ruleVLSVariable

+                                {

+                                        if ($current==null) {

+                                                $current = createModelElementForParent(grammarAccess.getVLSVariableDeclarationRule());

+                                        }

+                                        set(

+                                                $current,

+                                                "name",

+                                                lv_name_0_0,

+                                                "ca.mcgill.ecse.dslreasoner.VampireLanguage.VLSVariable");

+                                        afterParserOrEnumRuleCall();

+                                }

+                        )

+                )

                 otherlv_1=':'

                 {

                         newLeafNode(otherlv_1, grammarAccess.getVLSVariableDeclarationAccess().getColonKeyword_1());

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageLexer.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageLexer.java
index 158c056c..a35c88e6 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageLexer.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageLexer.java
@@ -1331,8 +1331,8 @@ public class InternalVampireLanguageLexer extends Lexer {
     // $ANTLR start "RULE_ALPHA_NUMERIC"

     public final void mRULE_ALPHA_NUMERIC() throws RecognitionException {

         try {

-            // InternalVampireLanguage.g:2774:29: ( ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' ) )

-            // InternalVampireLanguage.g:2774:31: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )

+            // InternalVampireLanguage.g:2796:29: ( ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' ) )

+            // InternalVampireLanguage.g:2796:31: ( 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' )

             {

             if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {

                 input.consume();

@@ -1357,11 +1357,11 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_UPPER_WORD_ID;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2776:20: ( 'A' .. 'Z' ( RULE_ALPHA_NUMERIC )* )

-            // InternalVampireLanguage.g:2776:22: 'A' .. 'Z' ( RULE_ALPHA_NUMERIC )*

+            // InternalVampireLanguage.g:2798:20: ( 'A' .. 'Z' ( RULE_ALPHA_NUMERIC )* )

+            // InternalVampireLanguage.g:2798:22: 'A' .. 'Z' ( RULE_ALPHA_NUMERIC )*

             {

             matchRange('A','Z'); 

-            // InternalVampireLanguage.g:2776:31: ( RULE_ALPHA_NUMERIC )*

+            // InternalVampireLanguage.g:2798:31: ( RULE_ALPHA_NUMERIC )*

             loop1:

             do {

                 int alt1=2;

@@ -1374,7 +1374,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt1) {

                 case 1 :

-                    // InternalVampireLanguage.g:2776:31: RULE_ALPHA_NUMERIC

+                    // InternalVampireLanguage.g:2798:31: RULE_ALPHA_NUMERIC

                     {

                     mRULE_ALPHA_NUMERIC(); 

 

@@ -1402,11 +1402,11 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_LOWER_WORD_ID;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2778:20: ( 'a' .. 'z' ( RULE_ALPHA_NUMERIC )* )

-            // InternalVampireLanguage.g:2778:22: 'a' .. 'z' ( RULE_ALPHA_NUMERIC )*

+            // InternalVampireLanguage.g:2800:20: ( 'a' .. 'z' ( RULE_ALPHA_NUMERIC )* )

+            // InternalVampireLanguage.g:2800:22: 'a' .. 'z' ( RULE_ALPHA_NUMERIC )*

             {

             matchRange('a','z'); 

-            // InternalVampireLanguage.g:2778:31: ( RULE_ALPHA_NUMERIC )*

+            // InternalVampireLanguage.g:2800:31: ( RULE_ALPHA_NUMERIC )*

             loop2:

             do {

                 int alt2=2;

@@ -1419,7 +1419,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt2) {

                 case 1 :

-                    // InternalVampireLanguage.g:2778:31: RULE_ALPHA_NUMERIC

+                    // InternalVampireLanguage.g:2800:31: RULE_ALPHA_NUMERIC

                     {

                     mRULE_ALPHA_NUMERIC(); 

 

@@ -1447,11 +1447,11 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_DOUBLE_QUOTE;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2780:19: ( '\"' ( '\\\\' ( '\"' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )

-            // InternalVampireLanguage.g:2780:21: '\"' ( '\\\\' ( '\"' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'

+            // InternalVampireLanguage.g:2802:19: ( '\"' ( '\\\\' ( '\"' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )

+            // InternalVampireLanguage.g:2802:21: '\"' ( '\\\\' ( '\"' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"'

             {

             match('\"'); 

-            // InternalVampireLanguage.g:2780:25: ( '\\\\' ( '\"' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*

+            // InternalVampireLanguage.g:2802:25: ( '\\\\' ( '\"' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )*

             loop3:

             do {

                 int alt3=3;

@@ -1467,7 +1467,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt3) {

                 case 1 :

-                    // InternalVampireLanguage.g:2780:26: '\\\\' ( '\"' | '\\\\' )

+                    // InternalVampireLanguage.g:2802:26: '\\\\' ( '\"' | '\\\\' )

                     {

                     match('\\'); 

                     if ( input.LA(1)=='\"'||input.LA(1)=='\\' ) {

@@ -1483,7 +1483,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:2780:42: ~ ( ( '\\\\' | '\"' ) )

+                    // InternalVampireLanguage.g:2802:42: ~ ( ( '\\\\' | '\"' ) )

                     {

                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {

                         input.consume();

@@ -1520,11 +1520,11 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_SINGLE_QUOTE;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2782:19: ( '\\'' ( '\\\\' ( '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )+ '\\'' )

-            // InternalVampireLanguage.g:2782:21: '\\'' ( '\\\\' ( '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )+ '\\''

+            // InternalVampireLanguage.g:2804:19: ( '\\'' ( '\\\\' ( '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )+ '\\'' )

+            // InternalVampireLanguage.g:2804:21: '\\'' ( '\\\\' ( '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )+ '\\''

             {

             match('\''); 

-            // InternalVampireLanguage.g:2782:26: ( '\\\\' ( '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )+

+            // InternalVampireLanguage.g:2804:26: ( '\\\\' ( '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )+

             int cnt4=0;

             loop4:

             do {

@@ -1541,7 +1541,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt4) {

                 case 1 :

-                    // InternalVampireLanguage.g:2782:27: '\\\\' ( '\\'' | '\\\\' )

+                    // InternalVampireLanguage.g:2804:27: '\\\\' ( '\\'' | '\\\\' )

                     {

                     match('\\'); 

                     if ( input.LA(1)=='\''||input.LA(1)=='\\' ) {

@@ -1557,7 +1557,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:2782:44: ~ ( ( '\\\\' | '\\'' ) )

+                    // InternalVampireLanguage.g:2804:44: ~ ( ( '\\\\' | '\\'' ) )

                     {

                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {

                         input.consume();

@@ -1596,8 +1596,8 @@ public class InternalVampireLanguageLexer extends Lexer {
     // $ANTLR start "RULE_SIGN"

     public final void mRULE_SIGN() throws RecognitionException {

         try {

-            // InternalVampireLanguage.g:2784:20: ( ( '+' | '-' ) )

-            // InternalVampireLanguage.g:2784:22: ( '+' | '-' )

+            // InternalVampireLanguage.g:2806:20: ( ( '+' | '-' ) )

+            // InternalVampireLanguage.g:2806:22: ( '+' | '-' )

             {

             if ( input.LA(1)=='+'||input.LA(1)=='-' ) {

                 input.consume();

@@ -1622,8 +1622,8 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_DOLLAR_ID;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2786:16: ( '$' RULE_LOWER_WORD_ID )

-            // InternalVampireLanguage.g:2786:18: '$' RULE_LOWER_WORD_ID

+            // InternalVampireLanguage.g:2808:16: ( '$' RULE_LOWER_WORD_ID )

+            // InternalVampireLanguage.g:2808:18: '$' RULE_LOWER_WORD_ID

             {

             match('$'); 

             mRULE_LOWER_WORD_ID(); 

@@ -1643,8 +1643,8 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_DOUBLE_DOLLAR_ID;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2788:23: ( '$$' RULE_LOWER_WORD_ID )

-            // InternalVampireLanguage.g:2788:25: '$$' RULE_LOWER_WORD_ID

+            // InternalVampireLanguage.g:2810:23: ( '$$' RULE_LOWER_WORD_ID )

+            // InternalVampireLanguage.g:2810:25: '$$' RULE_LOWER_WORD_ID

             {

             match("$$"); 

 

@@ -1665,10 +1665,10 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_LITERAL;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2790:14: ( ( '0' | '1' .. '9' ( RULE_INT )? ) )

-            // InternalVampireLanguage.g:2790:16: ( '0' | '1' .. '9' ( RULE_INT )? )

+            // InternalVampireLanguage.g:2812:14: ( ( '0' | '1' .. '9' ( RULE_INT )? ) )

+            // InternalVampireLanguage.g:2812:16: ( '0' | '1' .. '9' ( RULE_INT )? )

             {

-            // InternalVampireLanguage.g:2790:16: ( '0' | '1' .. '9' ( RULE_INT )? )

+            // InternalVampireLanguage.g:2812:16: ( '0' | '1' .. '9' ( RULE_INT )? )

             int alt6=2;

             int LA6_0 = input.LA(1);

 

@@ -1686,17 +1686,17 @@ public class InternalVampireLanguageLexer extends Lexer {
             }

             switch (alt6) {

                 case 1 :

-                    // InternalVampireLanguage.g:2790:17: '0'

+                    // InternalVampireLanguage.g:2812:17: '0'

                     {

                     match('0'); 

 

                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:2790:21: '1' .. '9' ( RULE_INT )?

+                    // InternalVampireLanguage.g:2812:21: '1' .. '9' ( RULE_INT )?

                     {

                     matchRange('1','9'); 

-                    // InternalVampireLanguage.g:2790:30: ( RULE_INT )?

+                    // InternalVampireLanguage.g:2812:30: ( RULE_INT )?

                     int alt5=2;

                     int LA5_0 = input.LA(1);

 

@@ -1705,7 +1705,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                     }

                     switch (alt5) {

                         case 1 :

-                            // InternalVampireLanguage.g:2790:30: RULE_INT

+                            // InternalVampireLanguage.g:2812:30: RULE_INT

                             {

                             mRULE_INT(); 

 

@@ -1736,10 +1736,10 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_SIGNED_LITERAL;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2792:21: ( ( RULE_SIGN )* RULE_LITERAL )

-            // InternalVampireLanguage.g:2792:23: ( RULE_SIGN )* RULE_LITERAL

+            // InternalVampireLanguage.g:2814:21: ( ( RULE_SIGN )* RULE_LITERAL )

+            // InternalVampireLanguage.g:2814:23: ( RULE_SIGN )* RULE_LITERAL

             {

-            // InternalVampireLanguage.g:2792:23: ( RULE_SIGN )*

+            // InternalVampireLanguage.g:2814:23: ( RULE_SIGN )*

             loop7:

             do {

                 int alt7=2;

@@ -1752,7 +1752,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt7) {

                 case 1 :

-                    // InternalVampireLanguage.g:2792:23: RULE_SIGN

+                    // InternalVampireLanguage.g:2814:23: RULE_SIGN

                     {

                     mRULE_SIGN(); 

 

@@ -1781,11 +1781,11 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_SINGLE_COMMENT;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2794:21: ( '%' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )

-            // InternalVampireLanguage.g:2794:23: '%' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?

+            // InternalVampireLanguage.g:2816:21: ( '%' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )

+            // InternalVampireLanguage.g:2816:23: '%' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?

             {

             match('%'); 

-            // InternalVampireLanguage.g:2794:27: (~ ( ( '\\n' | '\\r' ) ) )*

+            // InternalVampireLanguage.g:2816:27: (~ ( ( '\\n' | '\\r' ) ) )*

             loop8:

             do {

                 int alt8=2;

@@ -1798,7 +1798,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt8) {

                 case 1 :

-                    // InternalVampireLanguage.g:2794:27: ~ ( ( '\\n' | '\\r' ) )

+                    // InternalVampireLanguage.g:2816:27: ~ ( ( '\\n' | '\\r' ) )

                     {

                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {

                         input.consume();

@@ -1818,7 +1818,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                 }

             } while (true);

 

-            // InternalVampireLanguage.g:2794:43: ( ( '\\r' )? '\\n' )?

+            // InternalVampireLanguage.g:2816:43: ( ( '\\r' )? '\\n' )?

             int alt10=2;

             int LA10_0 = input.LA(1);

 

@@ -1827,9 +1827,9 @@ public class InternalVampireLanguageLexer extends Lexer {
             }

             switch (alt10) {

                 case 1 :

-                    // InternalVampireLanguage.g:2794:44: ( '\\r' )? '\\n'

+                    // InternalVampireLanguage.g:2816:44: ( '\\r' )? '\\n'

                     {

-                    // InternalVampireLanguage.g:2794:44: ( '\\r' )?

+                    // InternalVampireLanguage.g:2816:44: ( '\\r' )?

                     int alt9=2;

                     int LA9_0 = input.LA(1);

 

@@ -1838,7 +1838,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                     }

                     switch (alt9) {

                         case 1 :

-                            // InternalVampireLanguage.g:2794:44: '\\r'

+                            // InternalVampireLanguage.g:2816:44: '\\r'

                             {

                             match('\r'); 

 

@@ -1870,10 +1870,10 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_ID;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2796:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )

-            // InternalVampireLanguage.g:2796:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*

+            // InternalVampireLanguage.g:2818:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )

+            // InternalVampireLanguage.g:2818:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*

             {

-            // InternalVampireLanguage.g:2796:11: ( '^' )?

+            // InternalVampireLanguage.g:2818:11: ( '^' )?

             int alt11=2;

             int LA11_0 = input.LA(1);

 

@@ -1882,7 +1882,7 @@ public class InternalVampireLanguageLexer extends Lexer {
             }

             switch (alt11) {

                 case 1 :

-                    // InternalVampireLanguage.g:2796:11: '^'

+                    // InternalVampireLanguage.g:2818:11: '^'

                     {

                     match('^'); 

 

@@ -1900,7 +1900,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                 recover(mse);

                 throw mse;}

 

-            // InternalVampireLanguage.g:2796:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*

+            // InternalVampireLanguage.g:2818:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*

             loop12:

             do {

                 int alt12=2;

@@ -1947,10 +1947,10 @@ public class InternalVampireLanguageLexer extends Lexer {
     // $ANTLR start "RULE_INT"

     public final void mRULE_INT() throws RecognitionException {

         try {

-            // InternalVampireLanguage.g:2798:19: ( ( '0' .. '9' )+ )

-            // InternalVampireLanguage.g:2798:21: ( '0' .. '9' )+

+            // InternalVampireLanguage.g:2820:19: ( ( '0' .. '9' )+ )

+            // InternalVampireLanguage.g:2820:21: ( '0' .. '9' )+

             {

-            // InternalVampireLanguage.g:2798:21: ( '0' .. '9' )+

+            // InternalVampireLanguage.g:2820:21: ( '0' .. '9' )+

             int cnt13=0;

             loop13:

             do {

@@ -1964,7 +1964,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt13) {

                 case 1 :

-                    // InternalVampireLanguage.g:2798:22: '0' .. '9'

+                    // InternalVampireLanguage.g:2820:22: '0' .. '9'

                     {

                     matchRange('0','9'); 

 

@@ -1994,10 +1994,10 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_STRING;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2800:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )

-            // InternalVampireLanguage.g:2800:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

+            // InternalVampireLanguage.g:2822:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )

+            // InternalVampireLanguage.g:2822:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

             {

-            // InternalVampireLanguage.g:2800:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

+            // InternalVampireLanguage.g:2822:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )

             int alt16=2;

             int LA16_0 = input.LA(1);

 

@@ -2015,10 +2015,10 @@ public class InternalVampireLanguageLexer extends Lexer {
             }

             switch (alt16) {

                 case 1 :

-                    // InternalVampireLanguage.g:2800:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'

+                    // InternalVampireLanguage.g:2822:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'

                     {

                     match('\"'); 

-                    // InternalVampireLanguage.g:2800:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*

+                    // InternalVampireLanguage.g:2822:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*

                     loop14:

                     do {

                         int alt14=3;

@@ -2034,7 +2034,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                         switch (alt14) {

                         case 1 :

-                            // InternalVampireLanguage.g:2800:21: '\\\\' .

+                            // InternalVampireLanguage.g:2822:21: '\\\\' .

                             {

                             match('\\'); 

                             matchAny(); 

@@ -2042,7 +2042,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                             }

                             break;

                         case 2 :

-                            // InternalVampireLanguage.g:2800:28: ~ ( ( '\\\\' | '\"' ) )

+                            // InternalVampireLanguage.g:2822:28: ~ ( ( '\\\\' | '\"' ) )

                             {

                             if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {

                                 input.consume();

@@ -2067,10 +2067,10 @@ public class InternalVampireLanguageLexer extends Lexer {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:2800:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''

+                    // InternalVampireLanguage.g:2822:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''

                     {

                     match('\''); 

-                    // InternalVampireLanguage.g:2800:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*

+                    // InternalVampireLanguage.g:2822:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*

                     loop15:

                     do {

                         int alt15=3;

@@ -2086,7 +2086,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                         switch (alt15) {

                         case 1 :

-                            // InternalVampireLanguage.g:2800:54: '\\\\' .

+                            // InternalVampireLanguage.g:2822:54: '\\\\' .

                             {

                             match('\\'); 

                             matchAny(); 

@@ -2094,7 +2094,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                             }

                             break;

                         case 2 :

-                            // InternalVampireLanguage.g:2800:61: ~ ( ( '\\\\' | '\\'' ) )

+                            // InternalVampireLanguage.g:2822:61: ~ ( ( '\\\\' | '\\'' ) )

                             {

                             if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {

                                 input.consume();

@@ -2137,12 +2137,12 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_ML_COMMENT;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2802:17: ( '/*' ( options {greedy=false; } : . )* '*/' )

-            // InternalVampireLanguage.g:2802:19: '/*' ( options {greedy=false; } : . )* '*/'

+            // InternalVampireLanguage.g:2824:17: ( '/*' ( options {greedy=false; } : . )* '*/' )

+            // InternalVampireLanguage.g:2824:19: '/*' ( options {greedy=false; } : . )* '*/'

             {

             match("/*"); 

 

-            // InternalVampireLanguage.g:2802:24: ( options {greedy=false; } : . )*

+            // InternalVampireLanguage.g:2824:24: ( options {greedy=false; } : . )*

             loop17:

             do {

                 int alt17=2;

@@ -2167,7 +2167,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt17) {

                 case 1 :

-                    // InternalVampireLanguage.g:2802:52: .

+                    // InternalVampireLanguage.g:2824:52: .

                     {

                     matchAny(); 

 

@@ -2197,12 +2197,12 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_SL_COMMENT;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2804:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )

-            // InternalVampireLanguage.g:2804:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?

+            // InternalVampireLanguage.g:2826:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )

+            // InternalVampireLanguage.g:2826:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?

             {

             match("//"); 

 

-            // InternalVampireLanguage.g:2804:24: (~ ( ( '\\n' | '\\r' ) ) )*

+            // InternalVampireLanguage.g:2826:24: (~ ( ( '\\n' | '\\r' ) ) )*

             loop18:

             do {

                 int alt18=2;

@@ -2215,7 +2215,7 @@ public class InternalVampireLanguageLexer extends Lexer {
 

                 switch (alt18) {

                 case 1 :

-                    // InternalVampireLanguage.g:2804:24: ~ ( ( '\\n' | '\\r' ) )

+                    // InternalVampireLanguage.g:2826:24: ~ ( ( '\\n' | '\\r' ) )

                     {

                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {

                         input.consume();

@@ -2235,7 +2235,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                 }

             } while (true);

 

-            // InternalVampireLanguage.g:2804:40: ( ( '\\r' )? '\\n' )?

+            // InternalVampireLanguage.g:2826:40: ( ( '\\r' )? '\\n' )?

             int alt20=2;

             int LA20_0 = input.LA(1);

 

@@ -2244,9 +2244,9 @@ public class InternalVampireLanguageLexer extends Lexer {
             }

             switch (alt20) {

                 case 1 :

-                    // InternalVampireLanguage.g:2804:41: ( '\\r' )? '\\n'

+                    // InternalVampireLanguage.g:2826:41: ( '\\r' )? '\\n'

                     {

-                    // InternalVampireLanguage.g:2804:41: ( '\\r' )?

+                    // InternalVampireLanguage.g:2826:41: ( '\\r' )?

                     int alt19=2;

                     int LA19_0 = input.LA(1);

 

@@ -2255,7 +2255,7 @@ public class InternalVampireLanguageLexer extends Lexer {
                     }

                     switch (alt19) {

                         case 1 :

-                            // InternalVampireLanguage.g:2804:41: '\\r'

+                            // InternalVampireLanguage.g:2826:41: '\\r'

                             {

                             match('\r'); 

 

@@ -2287,10 +2287,10 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_WS;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2806:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )

-            // InternalVampireLanguage.g:2806:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

+            // InternalVampireLanguage.g:2828:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )

+            // InternalVampireLanguage.g:2828:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

             {

-            // InternalVampireLanguage.g:2806:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

+            // InternalVampireLanguage.g:2828:11: ( ' ' | '\\t' | '\\r' | '\\n' )+

             int cnt21=0;

             loop21:

             do {

@@ -2344,8 +2344,8 @@ public class InternalVampireLanguageLexer extends Lexer {
         try {

             int _type = RULE_ANY_OTHER;

             int _channel = DEFAULT_TOKEN_CHANNEL;

-            // InternalVampireLanguage.g:2808:16: ( . )

-            // InternalVampireLanguage.g:2808:18: .

+            // InternalVampireLanguage.g:2830:16: ( . )

+            // InternalVampireLanguage.g:2830:18: .

             {

             matchAny(); 

 

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageParser.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageParser.java
index a644dcef..bf37606b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageParser.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/parser/antlr/internal/InternalVampireLanguageParser.java
@@ -2906,12 +2906,12 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSOtherDeclaration"

-    // InternalVampireLanguage.g:1111:1: ruleVLSOtherDeclaration returns [EObject current=null] : (this_VLSAtomicConstant_0= ruleVLSAtomicConstant otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) ) ;

+    // InternalVampireLanguage.g:1111:1: ruleVLSOtherDeclaration returns [EObject current=null] : ( ( (lv_name_0_0= ruleVLSAtomicConstant ) ) otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) ) ;

     public final EObject ruleVLSOtherDeclaration() throws RecognitionException {

         EObject current = null;

 

         Token otherlv_1=null;

-        EObject this_VLSAtomicConstant_0 = null;

+        EObject lv_name_0_0 = null;

 

         EObject lv_type_2_0 = null;

 

@@ -2920,33 +2920,52 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:1117:2: ( (this_VLSAtomicConstant_0= ruleVLSAtomicConstant otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) ) )

-            // InternalVampireLanguage.g:1118:2: (this_VLSAtomicConstant_0= ruleVLSAtomicConstant otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) )

+            // InternalVampireLanguage.g:1117:2: ( ( ( (lv_name_0_0= ruleVLSAtomicConstant ) ) otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) ) )

+            // InternalVampireLanguage.g:1118:2: ( ( (lv_name_0_0= ruleVLSAtomicConstant ) ) otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) )

+            {

+            // InternalVampireLanguage.g:1118:2: ( ( (lv_name_0_0= ruleVLSAtomicConstant ) ) otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) )

+            // InternalVampireLanguage.g:1119:3: ( (lv_name_0_0= ruleVLSAtomicConstant ) ) otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) )

+            {

+            // InternalVampireLanguage.g:1119:3: ( (lv_name_0_0= ruleVLSAtomicConstant ) )

+            // InternalVampireLanguage.g:1120:4: (lv_name_0_0= ruleVLSAtomicConstant )

             {

-            // InternalVampireLanguage.g:1118:2: (this_VLSAtomicConstant_0= ruleVLSAtomicConstant otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) )

-            // InternalVampireLanguage.g:1119:3: this_VLSAtomicConstant_0= ruleVLSAtomicConstant otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) )

+            // InternalVampireLanguage.g:1120:4: (lv_name_0_0= ruleVLSAtomicConstant )

+            // InternalVampireLanguage.g:1121:5: lv_name_0_0= ruleVLSAtomicConstant

             {

 

-                                newCompositeNode(grammarAccess.getVLSOtherDeclarationAccess().getVLSAtomicConstantParserRuleCall_0());

-                        

+                                                newCompositeNode(grammarAccess.getVLSOtherDeclarationAccess().getNameVLSAtomicConstantParserRuleCall_0_0());

+                                        

             pushFollow(FOLLOW_32);

-            this_VLSAtomicConstant_0=ruleVLSAtomicConstant();

+            lv_name_0_0=ruleVLSAtomicConstant();

 

             state._fsp--;

 

 

-                                current = this_VLSAtomicConstant_0;

-                                afterParserOrEnumRuleCall();

-                        

+                                                if (current==null) {

+                                                        current = createModelElementForParent(grammarAccess.getVLSOtherDeclarationRule());

+                                                }

+                                                set(

+                                                        current,

+                                                        "name",

+                                                        lv_name_0_0,

+                                                        "ca.mcgill.ecse.dslreasoner.VampireLanguage.VLSAtomicConstant");

+                                                afterParserOrEnumRuleCall();

+                                        

+

+            }

+

+

+            }

+

             otherlv_1=(Token)match(input,61,FOLLOW_33); 

 

                                 newLeafNode(otherlv_1, grammarAccess.getVLSOtherDeclarationAccess().getColonKeyword_1());

                         

-            // InternalVampireLanguage.g:1131:3: ( (lv_type_2_0= ruleVLSTypeDef ) )

-            // InternalVampireLanguage.g:1132:4: (lv_type_2_0= ruleVLSTypeDef )

+            // InternalVampireLanguage.g:1142:3: ( (lv_type_2_0= ruleVLSTypeDef ) )

+            // InternalVampireLanguage.g:1143:4: (lv_type_2_0= ruleVLSTypeDef )

             {

-            // InternalVampireLanguage.g:1132:4: (lv_type_2_0= ruleVLSTypeDef )

-            // InternalVampireLanguage.g:1133:5: lv_type_2_0= ruleVLSTypeDef

+            // InternalVampireLanguage.g:1143:4: (lv_type_2_0= ruleVLSTypeDef )

+            // InternalVampireLanguage.g:1144:5: lv_type_2_0= ruleVLSTypeDef

             {

 

                                                 newCompositeNode(grammarAccess.getVLSOtherDeclarationAccess().getTypeVLSTypeDefParserRuleCall_2_0());

@@ -2996,7 +3015,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSVariableDeclaration"

-    // InternalVampireLanguage.g:1154:1: entryRuleVLSVariableDeclaration returns [EObject current=null] : iv_ruleVLSVariableDeclaration= ruleVLSVariableDeclaration EOF ;

+    // InternalVampireLanguage.g:1165:1: entryRuleVLSVariableDeclaration returns [EObject current=null] : iv_ruleVLSVariableDeclaration= ruleVLSVariableDeclaration EOF ;

     public final EObject entryRuleVLSVariableDeclaration() throws RecognitionException {

         EObject current = null;

 

@@ -3004,8 +3023,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:1154:63: (iv_ruleVLSVariableDeclaration= ruleVLSVariableDeclaration EOF )

-            // InternalVampireLanguage.g:1155:2: iv_ruleVLSVariableDeclaration= ruleVLSVariableDeclaration EOF

+            // InternalVampireLanguage.g:1165:63: (iv_ruleVLSVariableDeclaration= ruleVLSVariableDeclaration EOF )

+            // InternalVampireLanguage.g:1166:2: iv_ruleVLSVariableDeclaration= ruleVLSVariableDeclaration EOF

             {

              newCompositeNode(grammarAccess.getVLSVariableDeclarationRule()); 

             pushFollow(FOLLOW_1);

@@ -3032,12 +3051,12 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSVariableDeclaration"

-    // InternalVampireLanguage.g:1161:1: ruleVLSVariableDeclaration returns [EObject current=null] : (this_VLSVariable_0= ruleVLSVariable otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) ) ;

+    // InternalVampireLanguage.g:1172:1: ruleVLSVariableDeclaration returns [EObject current=null] : ( ( (lv_name_0_0= ruleVLSVariable ) ) otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) ) ;

     public final EObject ruleVLSVariableDeclaration() throws RecognitionException {

         EObject current = null;

 

         Token otherlv_1=null;

-        EObject this_VLSVariable_0 = null;

+        EObject lv_name_0_0 = null;

 

         EObject lv_type_2_0 = null;

 

@@ -3046,33 +3065,52 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:1167:2: ( (this_VLSVariable_0= ruleVLSVariable otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) ) )

-            // InternalVampireLanguage.g:1168:2: (this_VLSVariable_0= ruleVLSVariable otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) )

+            // InternalVampireLanguage.g:1178:2: ( ( ( (lv_name_0_0= ruleVLSVariable ) ) otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) ) )

+            // InternalVampireLanguage.g:1179:2: ( ( (lv_name_0_0= ruleVLSVariable ) ) otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) )

+            {

+            // InternalVampireLanguage.g:1179:2: ( ( (lv_name_0_0= ruleVLSVariable ) ) otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) )

+            // InternalVampireLanguage.g:1180:3: ( (lv_name_0_0= ruleVLSVariable ) ) otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) )

+            {

+            // InternalVampireLanguage.g:1180:3: ( (lv_name_0_0= ruleVLSVariable ) )

+            // InternalVampireLanguage.g:1181:4: (lv_name_0_0= ruleVLSVariable )

             {

-            // InternalVampireLanguage.g:1168:2: (this_VLSVariable_0= ruleVLSVariable otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) ) )

-            // InternalVampireLanguage.g:1169:3: this_VLSVariable_0= ruleVLSVariable otherlv_1= ':' ( (lv_type_2_0= ruleVLSTypeDef ) )

+            // InternalVampireLanguage.g:1181:4: (lv_name_0_0= ruleVLSVariable )

+            // InternalVampireLanguage.g:1182:5: lv_name_0_0= ruleVLSVariable

             {

 

-                                newCompositeNode(grammarAccess.getVLSVariableDeclarationAccess().getVLSVariableParserRuleCall_0());

-                        

+                                                newCompositeNode(grammarAccess.getVLSVariableDeclarationAccess().getNameVLSVariableParserRuleCall_0_0());

+                                        

             pushFollow(FOLLOW_32);

-            this_VLSVariable_0=ruleVLSVariable();

+            lv_name_0_0=ruleVLSVariable();

 

             state._fsp--;

 

 

-                                current = this_VLSVariable_0;

-                                afterParserOrEnumRuleCall();

-                        

+                                                if (current==null) {

+                                                        current = createModelElementForParent(grammarAccess.getVLSVariableDeclarationRule());

+                                                }

+                                                set(

+                                                        current,

+                                                        "name",

+                                                        lv_name_0_0,

+                                                        "ca.mcgill.ecse.dslreasoner.VampireLanguage.VLSVariable");

+                                                afterParserOrEnumRuleCall();

+                                        

+

+            }

+

+

+            }

+

             otherlv_1=(Token)match(input,61,FOLLOW_33); 

 

                                 newLeafNode(otherlv_1, grammarAccess.getVLSVariableDeclarationAccess().getColonKeyword_1());

                         

-            // InternalVampireLanguage.g:1181:3: ( (lv_type_2_0= ruleVLSTypeDef ) )

-            // InternalVampireLanguage.g:1182:4: (lv_type_2_0= ruleVLSTypeDef )

+            // InternalVampireLanguage.g:1203:3: ( (lv_type_2_0= ruleVLSTypeDef ) )

+            // InternalVampireLanguage.g:1204:4: (lv_type_2_0= ruleVLSTypeDef )

             {

-            // InternalVampireLanguage.g:1182:4: (lv_type_2_0= ruleVLSTypeDef )

-            // InternalVampireLanguage.g:1183:5: lv_type_2_0= ruleVLSTypeDef

+            // InternalVampireLanguage.g:1204:4: (lv_type_2_0= ruleVLSTypeDef )

+            // InternalVampireLanguage.g:1205:5: lv_type_2_0= ruleVLSTypeDef

             {

 

                                                 newCompositeNode(grammarAccess.getVLSVariableDeclarationAccess().getTypeVLSTypeDefParserRuleCall_2_0());

@@ -3122,7 +3160,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSTypeDef"

-    // InternalVampireLanguage.g:1204:1: entryRuleVLSTypeDef returns [EObject current=null] : iv_ruleVLSTypeDef= ruleVLSTypeDef EOF ;

+    // InternalVampireLanguage.g:1226:1: entryRuleVLSTypeDef returns [EObject current=null] : iv_ruleVLSTypeDef= ruleVLSTypeDef EOF ;

     public final EObject entryRuleVLSTypeDef() throws RecognitionException {

         EObject current = null;

 

@@ -3130,8 +3168,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:1204:51: (iv_ruleVLSTypeDef= ruleVLSTypeDef EOF )

-            // InternalVampireLanguage.g:1205:2: iv_ruleVLSTypeDef= ruleVLSTypeDef EOF

+            // InternalVampireLanguage.g:1226:51: (iv_ruleVLSTypeDef= ruleVLSTypeDef EOF )

+            // InternalVampireLanguage.g:1227:2: iv_ruleVLSTypeDef= ruleVLSTypeDef EOF

             {

              newCompositeNode(grammarAccess.getVLSTypeDefRule()); 

             pushFollow(FOLLOW_1);

@@ -3158,7 +3196,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSTypeDef"

-    // InternalVampireLanguage.g:1211:1: ruleVLSTypeDef returns [EObject current=null] : ( ( (lv_typeSig_0_0= ruleVLSUnitaryTerm ) ) (otherlv_1= '>' ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) ) )? ) ;

+    // InternalVampireLanguage.g:1233:1: ruleVLSTypeDef returns [EObject current=null] : ( ( (lv_typeSig_0_0= ruleVLSUnitaryTerm ) ) (otherlv_1= '>' ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) ) )? ) ;

     public final EObject ruleVLSTypeDef() throws RecognitionException {

         EObject current = null;

 

@@ -3172,17 +3210,17 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:1217:2: ( ( ( (lv_typeSig_0_0= ruleVLSUnitaryTerm ) ) (otherlv_1= '>' ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) ) )? ) )

-            // InternalVampireLanguage.g:1218:2: ( ( (lv_typeSig_0_0= ruleVLSUnitaryTerm ) ) (otherlv_1= '>' ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) ) )? )

+            // InternalVampireLanguage.g:1239:2: ( ( ( (lv_typeSig_0_0= ruleVLSUnitaryTerm ) ) (otherlv_1= '>' ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) ) )? ) )

+            // InternalVampireLanguage.g:1240:2: ( ( (lv_typeSig_0_0= ruleVLSUnitaryTerm ) ) (otherlv_1= '>' ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) ) )? )

             {

-            // InternalVampireLanguage.g:1218:2: ( ( (lv_typeSig_0_0= ruleVLSUnitaryTerm ) ) (otherlv_1= '>' ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) ) )? )

-            // InternalVampireLanguage.g:1219:3: ( (lv_typeSig_0_0= ruleVLSUnitaryTerm ) ) (otherlv_1= '>' ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) ) )?

+            // InternalVampireLanguage.g:1240:2: ( ( (lv_typeSig_0_0= ruleVLSUnitaryTerm ) ) (otherlv_1= '>' ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) ) )? )

+            // InternalVampireLanguage.g:1241:3: ( (lv_typeSig_0_0= ruleVLSUnitaryTerm ) ) (otherlv_1= '>' ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) ) )?

             {

-            // InternalVampireLanguage.g:1219:3: ( (lv_typeSig_0_0= ruleVLSUnitaryTerm ) )

-            // InternalVampireLanguage.g:1220:4: (lv_typeSig_0_0= ruleVLSUnitaryTerm )

+            // InternalVampireLanguage.g:1241:3: ( (lv_typeSig_0_0= ruleVLSUnitaryTerm ) )

+            // InternalVampireLanguage.g:1242:4: (lv_typeSig_0_0= ruleVLSUnitaryTerm )

             {

-            // InternalVampireLanguage.g:1220:4: (lv_typeSig_0_0= ruleVLSUnitaryTerm )

-            // InternalVampireLanguage.g:1221:5: lv_typeSig_0_0= ruleVLSUnitaryTerm

+            // InternalVampireLanguage.g:1242:4: (lv_typeSig_0_0= ruleVLSUnitaryTerm )

+            // InternalVampireLanguage.g:1243:5: lv_typeSig_0_0= ruleVLSUnitaryTerm

             {

 

                                                 newCompositeNode(grammarAccess.getVLSTypeDefAccess().getTypeSigVLSUnitaryTermParserRuleCall_0_0());

@@ -3209,7 +3247,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

             }

 

-            // InternalVampireLanguage.g:1238:3: (otherlv_1= '>' ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) ) )?

+            // InternalVampireLanguage.g:1260:3: (otherlv_1= '>' ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) ) )?

             int alt17=2;

             int LA17_0 = input.LA(1);

 

@@ -3218,17 +3256,17 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
             }

             switch (alt17) {

                 case 1 :

-                    // InternalVampireLanguage.g:1239:4: otherlv_1= '>' ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) )

+                    // InternalVampireLanguage.g:1261:4: otherlv_1= '>' ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) )

                     {

                     otherlv_1=(Token)match(input,62,FOLLOW_35); 

 

                                                 newLeafNode(otherlv_1, grammarAccess.getVLSTypeDefAccess().getGreaterThanSignKeyword_1_0());

                                         

-                    // InternalVampireLanguage.g:1243:4: ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) )

-                    // InternalVampireLanguage.g:1244:5: (lv_mapsTo_2_0= ruleVLSAtomicConstant )

+                    // InternalVampireLanguage.g:1265:4: ( (lv_mapsTo_2_0= ruleVLSAtomicConstant ) )

+                    // InternalVampireLanguage.g:1266:5: (lv_mapsTo_2_0= ruleVLSAtomicConstant )

                     {

-                    // InternalVampireLanguage.g:1244:5: (lv_mapsTo_2_0= ruleVLSAtomicConstant )

-                    // InternalVampireLanguage.g:1245:6: lv_mapsTo_2_0= ruleVLSAtomicConstant

+                    // InternalVampireLanguage.g:1266:5: (lv_mapsTo_2_0= ruleVLSAtomicConstant )

+                    // InternalVampireLanguage.g:1267:6: lv_mapsTo_2_0= ruleVLSAtomicConstant

                     {

 

                                                                 newCompositeNode(grammarAccess.getVLSTypeDefAccess().getMapsToVLSAtomicConstantParserRuleCall_1_1_0());

@@ -3284,7 +3322,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSUnitaryTerm"

-    // InternalVampireLanguage.g:1267:1: entryRuleVLSUnitaryTerm returns [EObject current=null] : iv_ruleVLSUnitaryTerm= ruleVLSUnitaryTerm EOF ;

+    // InternalVampireLanguage.g:1289:1: entryRuleVLSUnitaryTerm returns [EObject current=null] : iv_ruleVLSUnitaryTerm= ruleVLSUnitaryTerm EOF ;

     public final EObject entryRuleVLSUnitaryTerm() throws RecognitionException {

         EObject current = null;

 

@@ -3292,8 +3330,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:1267:55: (iv_ruleVLSUnitaryTerm= ruleVLSUnitaryTerm EOF )

-            // InternalVampireLanguage.g:1268:2: iv_ruleVLSUnitaryTerm= ruleVLSUnitaryTerm EOF

+            // InternalVampireLanguage.g:1289:55: (iv_ruleVLSUnitaryTerm= ruleVLSUnitaryTerm EOF )

+            // InternalVampireLanguage.g:1290:2: iv_ruleVLSUnitaryTerm= ruleVLSUnitaryTerm EOF

             {

              newCompositeNode(grammarAccess.getVLSUnitaryTermRule()); 

             pushFollow(FOLLOW_1);

@@ -3320,7 +3358,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSUnitaryTerm"

-    // InternalVampireLanguage.g:1274:1: ruleVLSUnitaryTerm returns [EObject current=null] : ( ( (lv_initType_0_0= ruleVLSAtomic ) ) (otherlv_1= '*' ( (lv_nextType_2_0= ruleVLSAtomicConstant ) ) )* ) ;

+    // InternalVampireLanguage.g:1296:1: ruleVLSUnitaryTerm returns [EObject current=null] : ( ( (lv_initType_0_0= ruleVLSAtomic ) ) (otherlv_1= '*' ( (lv_nextType_2_0= ruleVLSAtomicConstant ) ) )* ) ;

     public final EObject ruleVLSUnitaryTerm() throws RecognitionException {

         EObject current = null;

 

@@ -3334,17 +3372,17 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:1280:2: ( ( ( (lv_initType_0_0= ruleVLSAtomic ) ) (otherlv_1= '*' ( (lv_nextType_2_0= ruleVLSAtomicConstant ) ) )* ) )

-            // InternalVampireLanguage.g:1281:2: ( ( (lv_initType_0_0= ruleVLSAtomic ) ) (otherlv_1= '*' ( (lv_nextType_2_0= ruleVLSAtomicConstant ) ) )* )

+            // InternalVampireLanguage.g:1302:2: ( ( ( (lv_initType_0_0= ruleVLSAtomic ) ) (otherlv_1= '*' ( (lv_nextType_2_0= ruleVLSAtomicConstant ) ) )* ) )

+            // InternalVampireLanguage.g:1303:2: ( ( (lv_initType_0_0= ruleVLSAtomic ) ) (otherlv_1= '*' ( (lv_nextType_2_0= ruleVLSAtomicConstant ) ) )* )

             {

-            // InternalVampireLanguage.g:1281:2: ( ( (lv_initType_0_0= ruleVLSAtomic ) ) (otherlv_1= '*' ( (lv_nextType_2_0= ruleVLSAtomicConstant ) ) )* )

-            // InternalVampireLanguage.g:1282:3: ( (lv_initType_0_0= ruleVLSAtomic ) ) (otherlv_1= '*' ( (lv_nextType_2_0= ruleVLSAtomicConstant ) ) )*

+            // InternalVampireLanguage.g:1303:2: ( ( (lv_initType_0_0= ruleVLSAtomic ) ) (otherlv_1= '*' ( (lv_nextType_2_0= ruleVLSAtomicConstant ) ) )* )

+            // InternalVampireLanguage.g:1304:3: ( (lv_initType_0_0= ruleVLSAtomic ) ) (otherlv_1= '*' ( (lv_nextType_2_0= ruleVLSAtomicConstant ) ) )*

             {

-            // InternalVampireLanguage.g:1282:3: ( (lv_initType_0_0= ruleVLSAtomic ) )

-            // InternalVampireLanguage.g:1283:4: (lv_initType_0_0= ruleVLSAtomic )

+            // InternalVampireLanguage.g:1304:3: ( (lv_initType_0_0= ruleVLSAtomic ) )

+            // InternalVampireLanguage.g:1305:4: (lv_initType_0_0= ruleVLSAtomic )

             {

-            // InternalVampireLanguage.g:1283:4: (lv_initType_0_0= ruleVLSAtomic )

-            // InternalVampireLanguage.g:1284:5: lv_initType_0_0= ruleVLSAtomic

+            // InternalVampireLanguage.g:1305:4: (lv_initType_0_0= ruleVLSAtomic )

+            // InternalVampireLanguage.g:1306:5: lv_initType_0_0= ruleVLSAtomic

             {

 

                                                 newCompositeNode(grammarAccess.getVLSUnitaryTermAccess().getInitTypeVLSAtomicParserRuleCall_0_0());

@@ -3371,7 +3409,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

             }

 

-            // InternalVampireLanguage.g:1301:3: (otherlv_1= '*' ( (lv_nextType_2_0= ruleVLSAtomicConstant ) ) )*

+            // InternalVampireLanguage.g:1323:3: (otherlv_1= '*' ( (lv_nextType_2_0= ruleVLSAtomicConstant ) ) )*

             loop18:

             do {

                 int alt18=2;

@@ -3384,17 +3422,17 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                 switch (alt18) {

                 case 1 :

-                    // InternalVampireLanguage.g:1302:4: otherlv_1= '*' ( (lv_nextType_2_0= ruleVLSAtomicConstant ) )

+                    // InternalVampireLanguage.g:1324:4: otherlv_1= '*' ( (lv_nextType_2_0= ruleVLSAtomicConstant ) )

                     {

                     otherlv_1=(Token)match(input,63,FOLLOW_35); 

 

                                                 newLeafNode(otherlv_1, grammarAccess.getVLSUnitaryTermAccess().getAsteriskKeyword_1_0());

                                         

-                    // InternalVampireLanguage.g:1306:4: ( (lv_nextType_2_0= ruleVLSAtomicConstant ) )

-                    // InternalVampireLanguage.g:1307:5: (lv_nextType_2_0= ruleVLSAtomicConstant )

+                    // InternalVampireLanguage.g:1328:4: ( (lv_nextType_2_0= ruleVLSAtomicConstant ) )

+                    // InternalVampireLanguage.g:1329:5: (lv_nextType_2_0= ruleVLSAtomicConstant )

                     {

-                    // InternalVampireLanguage.g:1307:5: (lv_nextType_2_0= ruleVLSAtomicConstant )

-                    // InternalVampireLanguage.g:1308:6: lv_nextType_2_0= ruleVLSAtomicConstant

+                    // InternalVampireLanguage.g:1329:5: (lv_nextType_2_0= ruleVLSAtomicConstant )

+                    // InternalVampireLanguage.g:1330:6: lv_nextType_2_0= ruleVLSAtomicConstant

                     {

 

                                                                 newCompositeNode(grammarAccess.getVLSUnitaryTermAccess().getNextTypeVLSAtomicConstantParserRuleCall_1_1_0());

@@ -3453,7 +3491,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSTerm"

-    // InternalVampireLanguage.g:1330:1: entryRuleVLSTerm returns [EObject current=null] : iv_ruleVLSTerm= ruleVLSTerm EOF ;

+    // InternalVampireLanguage.g:1352:1: entryRuleVLSTerm returns [EObject current=null] : iv_ruleVLSTerm= ruleVLSTerm EOF ;

     public final EObject entryRuleVLSTerm() throws RecognitionException {

         EObject current = null;

 

@@ -3461,8 +3499,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:1330:48: (iv_ruleVLSTerm= ruleVLSTerm EOF )

-            // InternalVampireLanguage.g:1331:2: iv_ruleVLSTerm= ruleVLSTerm EOF

+            // InternalVampireLanguage.g:1352:48: (iv_ruleVLSTerm= ruleVLSTerm EOF )

+            // InternalVampireLanguage.g:1353:2: iv_ruleVLSTerm= ruleVLSTerm EOF

             {

              newCompositeNode(grammarAccess.getVLSTermRule()); 

             pushFollow(FOLLOW_1);

@@ -3489,7 +3527,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSTerm"

-    // InternalVampireLanguage.g:1337:1: ruleVLSTerm returns [EObject current=null] : this_VLSBinary_0= ruleVLSBinary ;

+    // InternalVampireLanguage.g:1359:1: ruleVLSTerm returns [EObject current=null] : this_VLSBinary_0= ruleVLSBinary ;

     public final EObject ruleVLSTerm() throws RecognitionException {

         EObject current = null;

 

@@ -3500,8 +3538,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:1343:2: (this_VLSBinary_0= ruleVLSBinary )

-            // InternalVampireLanguage.g:1344:2: this_VLSBinary_0= ruleVLSBinary

+            // InternalVampireLanguage.g:1365:2: (this_VLSBinary_0= ruleVLSBinary )

+            // InternalVampireLanguage.g:1366:2: this_VLSBinary_0= ruleVLSBinary

             {

 

                         newCompositeNode(grammarAccess.getVLSTermAccess().getVLSBinaryParserRuleCall());

@@ -3535,7 +3573,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSBinary"

-    // InternalVampireLanguage.g:1355:1: entryRuleVLSBinary returns [EObject current=null] : iv_ruleVLSBinary= ruleVLSBinary EOF ;

+    // InternalVampireLanguage.g:1377:1: entryRuleVLSBinary returns [EObject current=null] : iv_ruleVLSBinary= ruleVLSBinary EOF ;

     public final EObject entryRuleVLSBinary() throws RecognitionException {

         EObject current = null;

 

@@ -3543,8 +3581,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:1355:50: (iv_ruleVLSBinary= ruleVLSBinary EOF )

-            // InternalVampireLanguage.g:1356:2: iv_ruleVLSBinary= ruleVLSBinary EOF

+            // InternalVampireLanguage.g:1377:50: (iv_ruleVLSBinary= ruleVLSBinary EOF )

+            // InternalVampireLanguage.g:1378:2: iv_ruleVLSBinary= ruleVLSBinary EOF

             {

              newCompositeNode(grammarAccess.getVLSBinaryRule()); 

             pushFollow(FOLLOW_1);

@@ -3571,7 +3609,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSBinary"

-    // InternalVampireLanguage.g:1362:1: ruleVLSBinary returns [EObject current=null] : (this_VLSUnitaryFormula_0= ruleVLSUnitaryFormula ( ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) ) | ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+ | ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+ )? ) ;

+    // InternalVampireLanguage.g:1384:1: ruleVLSBinary returns [EObject current=null] : (this_VLSUnitaryFormula_0= ruleVLSUnitaryFormula ( ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) ) | ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+ | ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+ )? ) ;

     public final EObject ruleVLSBinary() throws RecognitionException {

         EObject current = null;

 

@@ -3596,11 +3634,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:1368:2: ( (this_VLSUnitaryFormula_0= ruleVLSUnitaryFormula ( ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) ) | ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+ | ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+ )? ) )

-            // InternalVampireLanguage.g:1369:2: (this_VLSUnitaryFormula_0= ruleVLSUnitaryFormula ( ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) ) | ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+ | ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+ )? )

+            // InternalVampireLanguage.g:1390:2: ( (this_VLSUnitaryFormula_0= ruleVLSUnitaryFormula ( ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) ) | ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+ | ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+ )? ) )

+            // InternalVampireLanguage.g:1391:2: (this_VLSUnitaryFormula_0= ruleVLSUnitaryFormula ( ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) ) | ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+ | ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+ )? )

             {

-            // InternalVampireLanguage.g:1369:2: (this_VLSUnitaryFormula_0= ruleVLSUnitaryFormula ( ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) ) | ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+ | ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+ )? )

-            // InternalVampireLanguage.g:1370:3: this_VLSUnitaryFormula_0= ruleVLSUnitaryFormula ( ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) ) | ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+ | ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+ )?

+            // InternalVampireLanguage.g:1391:2: (this_VLSUnitaryFormula_0= ruleVLSUnitaryFormula ( ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) ) | ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+ | ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+ )? )

+            // InternalVampireLanguage.g:1392:3: this_VLSUnitaryFormula_0= ruleVLSUnitaryFormula ( ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) ) | ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+ | ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+ )?

             {

 

                                 newCompositeNode(grammarAccess.getVLSBinaryAccess().getVLSUnitaryFormulaParserRuleCall_0());

@@ -3614,7 +3652,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                                 current = this_VLSUnitaryFormula_0;

                                 afterParserOrEnumRuleCall();

                         

-            // InternalVampireLanguage.g:1378:3: ( ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) ) | ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+ | ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+ )?

+            // InternalVampireLanguage.g:1400:3: ( ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) ) | ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+ | ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+ )?

             int alt22=4;

             switch ( input.LA(1) ) {

                 case 64:

@@ -3641,12 +3679,12 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

             switch (alt22) {

                 case 1 :

-                    // InternalVampireLanguage.g:1379:4: ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) )

+                    // InternalVampireLanguage.g:1401:4: ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) )

                     {

-                    // InternalVampireLanguage.g:1379:4: ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) )

-                    // InternalVampireLanguage.g:1380:5: ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) )

+                    // InternalVampireLanguage.g:1401:4: ( ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) ) )

+                    // InternalVampireLanguage.g:1402:5: ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) ) ( (lv_right_13_0= ruleVLSUnitaryFormula ) )

                     {

-                    // InternalVampireLanguage.g:1380:5: ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) )

+                    // InternalVampireLanguage.g:1402:5: ( ( () otherlv_2= '<=>' ) | ( () otherlv_4= '=>' ) | ( () otherlv_6= '<=' ) | ( () otherlv_8= '<~>' ) | ( () otherlv_10= '~|' ) | ( () otherlv_12= '~&' ) )

                     int alt19=6;

                     switch ( input.LA(1) ) {

                     case 64:

@@ -3688,13 +3726,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                     switch (alt19) {

                         case 1 :

-                            // InternalVampireLanguage.g:1381:6: ( () otherlv_2= '<=>' )

+                            // InternalVampireLanguage.g:1403:6: ( () otherlv_2= '<=>' )

                             {

-                            // InternalVampireLanguage.g:1381:6: ( () otherlv_2= '<=>' )

-                            // InternalVampireLanguage.g:1382:7: () otherlv_2= '<=>'

+                            // InternalVampireLanguage.g:1403:6: ( () otherlv_2= '<=>' )

+                            // InternalVampireLanguage.g:1404:7: () otherlv_2= '<=>'

                             {

-                            // InternalVampireLanguage.g:1382:7: ()

-                            // InternalVampireLanguage.g:1383:8: 

+                            // InternalVampireLanguage.g:1404:7: ()

+                            // InternalVampireLanguage.g:1405:8: 

                             {

 

                                                                                         current = forceCreateModelElementAndSet(

@@ -3715,13 +3753,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 2 :

-                            // InternalVampireLanguage.g:1395:6: ( () otherlv_4= '=>' )

+                            // InternalVampireLanguage.g:1417:6: ( () otherlv_4= '=>' )

                             {

-                            // InternalVampireLanguage.g:1395:6: ( () otherlv_4= '=>' )

-                            // InternalVampireLanguage.g:1396:7: () otherlv_4= '=>'

+                            // InternalVampireLanguage.g:1417:6: ( () otherlv_4= '=>' )

+                            // InternalVampireLanguage.g:1418:7: () otherlv_4= '=>'

                             {

-                            // InternalVampireLanguage.g:1396:7: ()

-                            // InternalVampireLanguage.g:1397:8: 

+                            // InternalVampireLanguage.g:1418:7: ()

+                            // InternalVampireLanguage.g:1419:8: 

                             {

 

                                                                                         current = forceCreateModelElementAndSet(

@@ -3742,13 +3780,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 3 :

-                            // InternalVampireLanguage.g:1409:6: ( () otherlv_6= '<=' )

+                            // InternalVampireLanguage.g:1431:6: ( () otherlv_6= '<=' )

                             {

-                            // InternalVampireLanguage.g:1409:6: ( () otherlv_6= '<=' )

-                            // InternalVampireLanguage.g:1410:7: () otherlv_6= '<='

+                            // InternalVampireLanguage.g:1431:6: ( () otherlv_6= '<=' )

+                            // InternalVampireLanguage.g:1432:7: () otherlv_6= '<='

                             {

-                            // InternalVampireLanguage.g:1410:7: ()

-                            // InternalVampireLanguage.g:1411:8: 

+                            // InternalVampireLanguage.g:1432:7: ()

+                            // InternalVampireLanguage.g:1433:8: 

                             {

 

                                                                                         current = forceCreateModelElementAndSet(

@@ -3769,13 +3807,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 4 :

-                            // InternalVampireLanguage.g:1423:6: ( () otherlv_8= '<~>' )

+                            // InternalVampireLanguage.g:1445:6: ( () otherlv_8= '<~>' )

                             {

-                            // InternalVampireLanguage.g:1423:6: ( () otherlv_8= '<~>' )

-                            // InternalVampireLanguage.g:1424:7: () otherlv_8= '<~>'

+                            // InternalVampireLanguage.g:1445:6: ( () otherlv_8= '<~>' )

+                            // InternalVampireLanguage.g:1446:7: () otherlv_8= '<~>'

                             {

-                            // InternalVampireLanguage.g:1424:7: ()

-                            // InternalVampireLanguage.g:1425:8: 

+                            // InternalVampireLanguage.g:1446:7: ()

+                            // InternalVampireLanguage.g:1447:8: 

                             {

 

                                                                                         current = forceCreateModelElementAndSet(

@@ -3796,13 +3834,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 5 :

-                            // InternalVampireLanguage.g:1437:6: ( () otherlv_10= '~|' )

+                            // InternalVampireLanguage.g:1459:6: ( () otherlv_10= '~|' )

                             {

-                            // InternalVampireLanguage.g:1437:6: ( () otherlv_10= '~|' )

-                            // InternalVampireLanguage.g:1438:7: () otherlv_10= '~|'

+                            // InternalVampireLanguage.g:1459:6: ( () otherlv_10= '~|' )

+                            // InternalVampireLanguage.g:1460:7: () otherlv_10= '~|'

                             {

-                            // InternalVampireLanguage.g:1438:7: ()

-                            // InternalVampireLanguage.g:1439:8: 

+                            // InternalVampireLanguage.g:1460:7: ()

+                            // InternalVampireLanguage.g:1461:8: 

                             {

 

                                                                                         current = forceCreateModelElementAndSet(

@@ -3823,13 +3861,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 6 :

-                            // InternalVampireLanguage.g:1451:6: ( () otherlv_12= '~&' )

+                            // InternalVampireLanguage.g:1473:6: ( () otherlv_12= '~&' )

                             {

-                            // InternalVampireLanguage.g:1451:6: ( () otherlv_12= '~&' )

-                            // InternalVampireLanguage.g:1452:7: () otherlv_12= '~&'

+                            // InternalVampireLanguage.g:1473:6: ( () otherlv_12= '~&' )

+                            // InternalVampireLanguage.g:1474:7: () otherlv_12= '~&'

                             {

-                            // InternalVampireLanguage.g:1452:7: ()

-                            // InternalVampireLanguage.g:1453:8: 

+                            // InternalVampireLanguage.g:1474:7: ()

+                            // InternalVampireLanguage.g:1475:8: 

                             {

 

                                                                                         current = forceCreateModelElementAndSet(

@@ -3852,11 +3890,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                     }

 

-                    // InternalVampireLanguage.g:1465:5: ( (lv_right_13_0= ruleVLSUnitaryFormula ) )

-                    // InternalVampireLanguage.g:1466:6: (lv_right_13_0= ruleVLSUnitaryFormula )

+                    // InternalVampireLanguage.g:1487:5: ( (lv_right_13_0= ruleVLSUnitaryFormula ) )

+                    // InternalVampireLanguage.g:1488:6: (lv_right_13_0= ruleVLSUnitaryFormula )

                     {

-                    // InternalVampireLanguage.g:1466:6: (lv_right_13_0= ruleVLSUnitaryFormula )

-                    // InternalVampireLanguage.g:1467:7: lv_right_13_0= ruleVLSUnitaryFormula

+                    // InternalVampireLanguage.g:1488:6: (lv_right_13_0= ruleVLSUnitaryFormula )

+                    // InternalVampireLanguage.g:1489:7: lv_right_13_0= ruleVLSUnitaryFormula

                     {

 

                                                                         newCompositeNode(grammarAccess.getVLSBinaryAccess().getRightVLSUnitaryFormulaParserRuleCall_1_0_1_0());

@@ -3890,9 +3928,9 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:1486:4: ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+

+                    // InternalVampireLanguage.g:1508:4: ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+

                     {

-                    // InternalVampireLanguage.g:1486:4: ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+

+                    // InternalVampireLanguage.g:1508:4: ( () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) ) )+

                     int cnt20=0;

                     loop20:

                     do {

@@ -3906,10 +3944,10 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                         switch (alt20) {

                         case 1 :

-                            // InternalVampireLanguage.g:1487:5: () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) )

+                            // InternalVampireLanguage.g:1509:5: () otherlv_15= '&' ( (lv_right_16_0= ruleVLSUnitaryFormula ) )

                             {

-                            // InternalVampireLanguage.g:1487:5: ()

-                            // InternalVampireLanguage.g:1488:6: 

+                            // InternalVampireLanguage.g:1509:5: ()

+                            // InternalVampireLanguage.g:1510:6: 

                             {

 

                                                                         current = forceCreateModelElementAndSet(

@@ -3923,11 +3961,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                                                                 newLeafNode(otherlv_15, grammarAccess.getVLSBinaryAccess().getAmpersandKeyword_1_1_1());

                                                         

-                            // InternalVampireLanguage.g:1498:5: ( (lv_right_16_0= ruleVLSUnitaryFormula ) )

-                            // InternalVampireLanguage.g:1499:6: (lv_right_16_0= ruleVLSUnitaryFormula )

+                            // InternalVampireLanguage.g:1520:5: ( (lv_right_16_0= ruleVLSUnitaryFormula ) )

+                            // InternalVampireLanguage.g:1521:6: (lv_right_16_0= ruleVLSUnitaryFormula )

                             {

-                            // InternalVampireLanguage.g:1499:6: (lv_right_16_0= ruleVLSUnitaryFormula )

-                            // InternalVampireLanguage.g:1500:7: lv_right_16_0= ruleVLSUnitaryFormula

+                            // InternalVampireLanguage.g:1521:6: (lv_right_16_0= ruleVLSUnitaryFormula )

+                            // InternalVampireLanguage.g:1522:7: lv_right_16_0= ruleVLSUnitaryFormula

                             {

 

                                                                                 newCompositeNode(grammarAccess.getVLSBinaryAccess().getRightVLSUnitaryFormulaParserRuleCall_1_1_2_0());

@@ -3971,9 +4009,9 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 3 :

-                    // InternalVampireLanguage.g:1519:4: ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+

+                    // InternalVampireLanguage.g:1541:4: ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+

                     {

-                    // InternalVampireLanguage.g:1519:4: ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+

+                    // InternalVampireLanguage.g:1541:4: ( () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) ) )+

                     int cnt21=0;

                     loop21:

                     do {

@@ -3987,10 +4025,10 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                         switch (alt21) {

                         case 1 :

-                            // InternalVampireLanguage.g:1520:5: () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) )

+                            // InternalVampireLanguage.g:1542:5: () otherlv_18= '|' ( (lv_right_19_0= ruleVLSUnitaryFormula ) )

                             {

-                            // InternalVampireLanguage.g:1520:5: ()

-                            // InternalVampireLanguage.g:1521:6: 

+                            // InternalVampireLanguage.g:1542:5: ()

+                            // InternalVampireLanguage.g:1543:6: 

                             {

 

                                                                         current = forceCreateModelElementAndSet(

@@ -4004,11 +4042,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                                                                 newLeafNode(otherlv_18, grammarAccess.getVLSBinaryAccess().getVerticalLineKeyword_1_2_1());

                                                         

-                            // InternalVampireLanguage.g:1531:5: ( (lv_right_19_0= ruleVLSUnitaryFormula ) )

-                            // InternalVampireLanguage.g:1532:6: (lv_right_19_0= ruleVLSUnitaryFormula )

+                            // InternalVampireLanguage.g:1553:5: ( (lv_right_19_0= ruleVLSUnitaryFormula ) )

+                            // InternalVampireLanguage.g:1554:6: (lv_right_19_0= ruleVLSUnitaryFormula )

                             {

-                            // InternalVampireLanguage.g:1532:6: (lv_right_19_0= ruleVLSUnitaryFormula )

-                            // InternalVampireLanguage.g:1533:7: lv_right_19_0= ruleVLSUnitaryFormula

+                            // InternalVampireLanguage.g:1554:6: (lv_right_19_0= ruleVLSUnitaryFormula )

+                            // InternalVampireLanguage.g:1555:7: lv_right_19_0= ruleVLSUnitaryFormula

                             {

 

                                                                                 newCompositeNode(grammarAccess.getVLSBinaryAccess().getRightVLSUnitaryFormulaParserRuleCall_1_2_2_0());

@@ -4077,7 +4115,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSUnitaryFormula"

-    // InternalVampireLanguage.g:1556:1: entryRuleVLSUnitaryFormula returns [EObject current=null] : iv_ruleVLSUnitaryFormula= ruleVLSUnitaryFormula EOF ;

+    // InternalVampireLanguage.g:1578:1: entryRuleVLSUnitaryFormula returns [EObject current=null] : iv_ruleVLSUnitaryFormula= ruleVLSUnitaryFormula EOF ;

     public final EObject entryRuleVLSUnitaryFormula() throws RecognitionException {

         EObject current = null;

 

@@ -4085,8 +4123,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:1556:58: (iv_ruleVLSUnitaryFormula= ruleVLSUnitaryFormula EOF )

-            // InternalVampireLanguage.g:1557:2: iv_ruleVLSUnitaryFormula= ruleVLSUnitaryFormula EOF

+            // InternalVampireLanguage.g:1578:58: (iv_ruleVLSUnitaryFormula= ruleVLSUnitaryFormula EOF )

+            // InternalVampireLanguage.g:1579:2: iv_ruleVLSUnitaryFormula= ruleVLSUnitaryFormula EOF

             {

              newCompositeNode(grammarAccess.getVLSUnitaryFormulaRule()); 

             pushFollow(FOLLOW_1);

@@ -4113,7 +4151,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSUnitaryFormula"

-    // InternalVampireLanguage.g:1563:1: ruleVLSUnitaryFormula returns [EObject current=null] : (this_VLSUniversalQuantifier_0= ruleVLSUniversalQuantifier | this_VLSExistentialQuantifier_1= ruleVLSExistentialQuantifier | this_VLSUnaryNegation_2= ruleVLSUnaryNegation | this_VLSUnaryInfix_3= ruleVLSUnaryInfix | (otherlv_4= '(' this_VLSTerm_5= ruleVLSTerm otherlv_6= ')' ) ) ;

+    // InternalVampireLanguage.g:1585:1: ruleVLSUnitaryFormula returns [EObject current=null] : (this_VLSUniversalQuantifier_0= ruleVLSUniversalQuantifier | this_VLSExistentialQuantifier_1= ruleVLSExistentialQuantifier | this_VLSUnaryNegation_2= ruleVLSUnaryNegation | this_VLSUnaryInfix_3= ruleVLSUnaryInfix | (otherlv_4= '(' this_VLSTerm_5= ruleVLSTerm otherlv_6= ')' ) ) ;

     public final EObject ruleVLSUnitaryFormula() throws RecognitionException {

         EObject current = null;

 

@@ -4134,10 +4172,10 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:1569:2: ( (this_VLSUniversalQuantifier_0= ruleVLSUniversalQuantifier | this_VLSExistentialQuantifier_1= ruleVLSExistentialQuantifier | this_VLSUnaryNegation_2= ruleVLSUnaryNegation | this_VLSUnaryInfix_3= ruleVLSUnaryInfix | (otherlv_4= '(' this_VLSTerm_5= ruleVLSTerm otherlv_6= ')' ) ) )

-            // InternalVampireLanguage.g:1570:2: (this_VLSUniversalQuantifier_0= ruleVLSUniversalQuantifier | this_VLSExistentialQuantifier_1= ruleVLSExistentialQuantifier | this_VLSUnaryNegation_2= ruleVLSUnaryNegation | this_VLSUnaryInfix_3= ruleVLSUnaryInfix | (otherlv_4= '(' this_VLSTerm_5= ruleVLSTerm otherlv_6= ')' ) )

+            // InternalVampireLanguage.g:1591:2: ( (this_VLSUniversalQuantifier_0= ruleVLSUniversalQuantifier | this_VLSExistentialQuantifier_1= ruleVLSExistentialQuantifier | this_VLSUnaryNegation_2= ruleVLSUnaryNegation | this_VLSUnaryInfix_3= ruleVLSUnaryInfix | (otherlv_4= '(' this_VLSTerm_5= ruleVLSTerm otherlv_6= ')' ) ) )

+            // InternalVampireLanguage.g:1592:2: (this_VLSUniversalQuantifier_0= ruleVLSUniversalQuantifier | this_VLSExistentialQuantifier_1= ruleVLSExistentialQuantifier | this_VLSUnaryNegation_2= ruleVLSUnaryNegation | this_VLSUnaryInfix_3= ruleVLSUnaryInfix | (otherlv_4= '(' this_VLSTerm_5= ruleVLSTerm otherlv_6= ')' ) )

             {

-            // InternalVampireLanguage.g:1570:2: (this_VLSUniversalQuantifier_0= ruleVLSUniversalQuantifier | this_VLSExistentialQuantifier_1= ruleVLSExistentialQuantifier | this_VLSUnaryNegation_2= ruleVLSUnaryNegation | this_VLSUnaryInfix_3= ruleVLSUnaryInfix | (otherlv_4= '(' this_VLSTerm_5= ruleVLSTerm otherlv_6= ')' ) )

+            // InternalVampireLanguage.g:1592:2: (this_VLSUniversalQuantifier_0= ruleVLSUniversalQuantifier | this_VLSExistentialQuantifier_1= ruleVLSExistentialQuantifier | this_VLSUnaryNegation_2= ruleVLSUnaryNegation | this_VLSUnaryInfix_3= ruleVLSUnaryInfix | (otherlv_4= '(' this_VLSTerm_5= ruleVLSTerm otherlv_6= ')' ) )

             int alt23=5;

             switch ( input.LA(1) ) {

             case 72:

@@ -4198,7 +4236,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

             switch (alt23) {

                 case 1 :

-                    // InternalVampireLanguage.g:1571:3: this_VLSUniversalQuantifier_0= ruleVLSUniversalQuantifier

+                    // InternalVampireLanguage.g:1593:3: this_VLSUniversalQuantifier_0= ruleVLSUniversalQuantifier

                     {

 

                                         newCompositeNode(grammarAccess.getVLSUnitaryFormulaAccess().getVLSUniversalQuantifierParserRuleCall_0());

@@ -4216,7 +4254,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:1580:3: this_VLSExistentialQuantifier_1= ruleVLSExistentialQuantifier

+                    // InternalVampireLanguage.g:1602:3: this_VLSExistentialQuantifier_1= ruleVLSExistentialQuantifier

                     {

 

                                         newCompositeNode(grammarAccess.getVLSUnitaryFormulaAccess().getVLSExistentialQuantifierParserRuleCall_1());

@@ -4234,7 +4272,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 3 :

-                    // InternalVampireLanguage.g:1589:3: this_VLSUnaryNegation_2= ruleVLSUnaryNegation

+                    // InternalVampireLanguage.g:1611:3: this_VLSUnaryNegation_2= ruleVLSUnaryNegation

                     {

 

                                         newCompositeNode(grammarAccess.getVLSUnitaryFormulaAccess().getVLSUnaryNegationParserRuleCall_2());

@@ -4252,7 +4290,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 4 :

-                    // InternalVampireLanguage.g:1598:3: this_VLSUnaryInfix_3= ruleVLSUnaryInfix

+                    // InternalVampireLanguage.g:1620:3: this_VLSUnaryInfix_3= ruleVLSUnaryInfix

                     {

 

                                         newCompositeNode(grammarAccess.getVLSUnitaryFormulaAccess().getVLSUnaryInfixParserRuleCall_3());

@@ -4270,10 +4308,10 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 5 :

-                    // InternalVampireLanguage.g:1607:3: (otherlv_4= '(' this_VLSTerm_5= ruleVLSTerm otherlv_6= ')' )

+                    // InternalVampireLanguage.g:1629:3: (otherlv_4= '(' this_VLSTerm_5= ruleVLSTerm otherlv_6= ')' )

                     {

-                    // InternalVampireLanguage.g:1607:3: (otherlv_4= '(' this_VLSTerm_5= ruleVLSTerm otherlv_6= ')' )

-                    // InternalVampireLanguage.g:1608:4: otherlv_4= '(' this_VLSTerm_5= ruleVLSTerm otherlv_6= ')'

+                    // InternalVampireLanguage.g:1629:3: (otherlv_4= '(' this_VLSTerm_5= ruleVLSTerm otherlv_6= ')' )

+                    // InternalVampireLanguage.g:1630:4: otherlv_4= '(' this_VLSTerm_5= ruleVLSTerm otherlv_6= ')'

                     {

                     otherlv_4=(Token)match(input,38,FOLLOW_20); 

 

@@ -4324,7 +4362,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSUniversalQuantifier"

-    // InternalVampireLanguage.g:1629:1: entryRuleVLSUniversalQuantifier returns [EObject current=null] : iv_ruleVLSUniversalQuantifier= ruleVLSUniversalQuantifier EOF ;

+    // InternalVampireLanguage.g:1651:1: entryRuleVLSUniversalQuantifier returns [EObject current=null] : iv_ruleVLSUniversalQuantifier= ruleVLSUniversalQuantifier EOF ;

     public final EObject entryRuleVLSUniversalQuantifier() throws RecognitionException {

         EObject current = null;

 

@@ -4332,8 +4370,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:1629:63: (iv_ruleVLSUniversalQuantifier= ruleVLSUniversalQuantifier EOF )

-            // InternalVampireLanguage.g:1630:2: iv_ruleVLSUniversalQuantifier= ruleVLSUniversalQuantifier EOF

+            // InternalVampireLanguage.g:1651:63: (iv_ruleVLSUniversalQuantifier= ruleVLSUniversalQuantifier EOF )

+            // InternalVampireLanguage.g:1652:2: iv_ruleVLSUniversalQuantifier= ruleVLSUniversalQuantifier EOF

             {

              newCompositeNode(grammarAccess.getVLSUniversalQuantifierRule()); 

             pushFollow(FOLLOW_1);

@@ -4360,7 +4398,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSUniversalQuantifier"

-    // InternalVampireLanguage.g:1636:1: ruleVLSUniversalQuantifier returns [EObject current=null] : ( () (otherlv_1= '!' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) ) ;

+    // InternalVampireLanguage.g:1658:1: ruleVLSUniversalQuantifier returns [EObject current=null] : ( () (otherlv_1= '!' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) ) ;

     public final EObject ruleVLSUniversalQuantifier() throws RecognitionException {

         EObject current = null;

 

@@ -4384,14 +4422,14 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:1642:2: ( ( () (otherlv_1= '!' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) ) )

-            // InternalVampireLanguage.g:1643:2: ( () (otherlv_1= '!' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) )

+            // InternalVampireLanguage.g:1664:2: ( ( () (otherlv_1= '!' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) ) )

+            // InternalVampireLanguage.g:1665:2: ( () (otherlv_1= '!' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) )

             {

-            // InternalVampireLanguage.g:1643:2: ( () (otherlv_1= '!' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) )

-            // InternalVampireLanguage.g:1644:3: () (otherlv_1= '!' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) )

+            // InternalVampireLanguage.g:1665:2: ( () (otherlv_1= '!' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) )

+            // InternalVampireLanguage.g:1666:3: () (otherlv_1= '!' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) )

             {

-            // InternalVampireLanguage.g:1644:3: ()

-            // InternalVampireLanguage.g:1645:4: 

+            // InternalVampireLanguage.g:1666:3: ()

+            // InternalVampireLanguage.g:1667:4: 

             {

 

                                         current = forceCreateModelElement(

@@ -4401,8 +4439,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

             }

 

-            // InternalVampireLanguage.g:1651:3: (otherlv_1= '!' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' )

-            // InternalVampireLanguage.g:1652:4: otherlv_1= '!' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':'

+            // InternalVampireLanguage.g:1673:3: (otherlv_1= '!' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' )

+            // InternalVampireLanguage.g:1674:4: otherlv_1= '!' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':'

             {

             otherlv_1=(Token)match(input,72,FOLLOW_11); 

 

@@ -4412,13 +4450,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                                         newLeafNode(otherlv_2, grammarAccess.getVLSUniversalQuantifierAccess().getLeftSquareBracketKeyword_1_1());

                                 

-            // InternalVampireLanguage.g:1660:4: ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) )

-            // InternalVampireLanguage.g:1661:5: ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) )

+            // InternalVampireLanguage.g:1682:4: ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) )

+            // InternalVampireLanguage.g:1683:5: ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) )

             {

-            // InternalVampireLanguage.g:1661:5: ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) )

-            // InternalVampireLanguage.g:1662:6: (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration )

+            // InternalVampireLanguage.g:1683:5: ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) )

+            // InternalVampireLanguage.g:1684:6: (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration )

             {

-            // InternalVampireLanguage.g:1662:6: (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration )

+            // InternalVampireLanguage.g:1684:6: (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration )

             int alt24=2;

             int LA24_0 = input.LA(1);

 

@@ -4446,7 +4484,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
             }

             switch (alt24) {

                 case 1 :

-                    // InternalVampireLanguage.g:1663:7: lv_variables_3_1= ruleVLSVariable

+                    // InternalVampireLanguage.g:1685:7: lv_variables_3_1= ruleVLSVariable

                     {

 

                                                                         newCompositeNode(grammarAccess.getVLSUniversalQuantifierAccess().getVariablesVLSVariableParserRuleCall_1_2_0_0());

@@ -4471,7 +4509,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:1679:7: lv_variables_3_2= ruleVLSVariableDeclaration

+                    // InternalVampireLanguage.g:1701:7: lv_variables_3_2= ruleVLSVariableDeclaration

                     {

 

                                                                         newCompositeNode(grammarAccess.getVLSUniversalQuantifierAccess().getVariablesVLSVariableDeclarationParserRuleCall_1_2_0_1());

@@ -4504,7 +4542,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

             }

 

-            // InternalVampireLanguage.g:1697:4: (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )*

+            // InternalVampireLanguage.g:1719:4: (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )*

             loop26:

             do {

                 int alt26=2;

@@ -4517,19 +4555,19 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                 switch (alt26) {

                 case 1 :

-                    // InternalVampireLanguage.g:1698:5: otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) )

+                    // InternalVampireLanguage.g:1720:5: otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) )

                     {

                     otherlv_4=(Token)match(input,39,FOLLOW_40); 

 

                                                         newLeafNode(otherlv_4, grammarAccess.getVLSUniversalQuantifierAccess().getCommaKeyword_1_3_0());

                                                 

-                    // InternalVampireLanguage.g:1702:5: ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) )

-                    // InternalVampireLanguage.g:1703:6: ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) )

+                    // InternalVampireLanguage.g:1724:5: ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) )

+                    // InternalVampireLanguage.g:1725:6: ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) )

                     {

-                    // InternalVampireLanguage.g:1703:6: ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) )

-                    // InternalVampireLanguage.g:1704:7: (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration )

+                    // InternalVampireLanguage.g:1725:6: ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) )

+                    // InternalVampireLanguage.g:1726:7: (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration )

                     {

-                    // InternalVampireLanguage.g:1704:7: (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration )

+                    // InternalVampireLanguage.g:1726:7: (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration )

                     int alt25=2;

                     int LA25_0 = input.LA(1);

 

@@ -4557,7 +4595,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     switch (alt25) {

                         case 1 :

-                            // InternalVampireLanguage.g:1705:8: lv_variables_5_1= ruleVLSVariable

+                            // InternalVampireLanguage.g:1727:8: lv_variables_5_1= ruleVLSVariable

                             {

 

                                                                                         newCompositeNode(grammarAccess.getVLSUniversalQuantifierAccess().getVariablesVLSVariableParserRuleCall_1_3_1_0_0());

@@ -4582,7 +4620,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 2 :

-                            // InternalVampireLanguage.g:1721:8: lv_variables_5_2= ruleVLSVariableDeclaration

+                            // InternalVampireLanguage.g:1743:8: lv_variables_5_2= ruleVLSVariableDeclaration

                             {

 

                                                                                         newCompositeNode(grammarAccess.getVLSUniversalQuantifierAccess().getVariablesVLSVariableDeclarationParserRuleCall_1_3_1_0_1());

@@ -4635,11 +4673,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

             }

 

-            // InternalVampireLanguage.g:1749:3: ( (lv_operand_8_0= ruleVLSUnitaryFormula ) )

-            // InternalVampireLanguage.g:1750:4: (lv_operand_8_0= ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:1771:3: ( (lv_operand_8_0= ruleVLSUnitaryFormula ) )

+            // InternalVampireLanguage.g:1772:4: (lv_operand_8_0= ruleVLSUnitaryFormula )

             {

-            // InternalVampireLanguage.g:1750:4: (lv_operand_8_0= ruleVLSUnitaryFormula )

-            // InternalVampireLanguage.g:1751:5: lv_operand_8_0= ruleVLSUnitaryFormula

+            // InternalVampireLanguage.g:1772:4: (lv_operand_8_0= ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:1773:5: lv_operand_8_0= ruleVLSUnitaryFormula

             {

 

                                                 newCompositeNode(grammarAccess.getVLSUniversalQuantifierAccess().getOperandVLSUnitaryFormulaParserRuleCall_2_0());

@@ -4689,7 +4727,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSExistentialQuantifier"

-    // InternalVampireLanguage.g:1772:1: entryRuleVLSExistentialQuantifier returns [EObject current=null] : iv_ruleVLSExistentialQuantifier= ruleVLSExistentialQuantifier EOF ;

+    // InternalVampireLanguage.g:1794:1: entryRuleVLSExistentialQuantifier returns [EObject current=null] : iv_ruleVLSExistentialQuantifier= ruleVLSExistentialQuantifier EOF ;

     public final EObject entryRuleVLSExistentialQuantifier() throws RecognitionException {

         EObject current = null;

 

@@ -4697,8 +4735,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:1772:65: (iv_ruleVLSExistentialQuantifier= ruleVLSExistentialQuantifier EOF )

-            // InternalVampireLanguage.g:1773:2: iv_ruleVLSExistentialQuantifier= ruleVLSExistentialQuantifier EOF

+            // InternalVampireLanguage.g:1794:65: (iv_ruleVLSExistentialQuantifier= ruleVLSExistentialQuantifier EOF )

+            // InternalVampireLanguage.g:1795:2: iv_ruleVLSExistentialQuantifier= ruleVLSExistentialQuantifier EOF

             {

              newCompositeNode(grammarAccess.getVLSExistentialQuantifierRule()); 

             pushFollow(FOLLOW_1);

@@ -4725,7 +4763,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSExistentialQuantifier"

-    // InternalVampireLanguage.g:1779:1: ruleVLSExistentialQuantifier returns [EObject current=null] : ( () (otherlv_1= '?' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) ) ;

+    // InternalVampireLanguage.g:1801:1: ruleVLSExistentialQuantifier returns [EObject current=null] : ( () (otherlv_1= '?' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) ) ;

     public final EObject ruleVLSExistentialQuantifier() throws RecognitionException {

         EObject current = null;

 

@@ -4749,14 +4787,14 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:1785:2: ( ( () (otherlv_1= '?' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) ) )

-            // InternalVampireLanguage.g:1786:2: ( () (otherlv_1= '?' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) )

+            // InternalVampireLanguage.g:1807:2: ( ( () (otherlv_1= '?' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) ) )

+            // InternalVampireLanguage.g:1808:2: ( () (otherlv_1= '?' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) )

             {

-            // InternalVampireLanguage.g:1786:2: ( () (otherlv_1= '?' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) )

-            // InternalVampireLanguage.g:1787:3: () (otherlv_1= '?' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) )

+            // InternalVampireLanguage.g:1808:2: ( () (otherlv_1= '?' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) ) )

+            // InternalVampireLanguage.g:1809:3: () (otherlv_1= '?' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' ) ( (lv_operand_8_0= ruleVLSUnitaryFormula ) )

             {

-            // InternalVampireLanguage.g:1787:3: ()

-            // InternalVampireLanguage.g:1788:4: 

+            // InternalVampireLanguage.g:1809:3: ()

+            // InternalVampireLanguage.g:1810:4: 

             {

 

                                         current = forceCreateModelElement(

@@ -4766,8 +4804,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

             }

 

-            // InternalVampireLanguage.g:1794:3: (otherlv_1= '?' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' )

-            // InternalVampireLanguage.g:1795:4: otherlv_1= '?' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':'

+            // InternalVampireLanguage.g:1816:3: (otherlv_1= '?' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':' )

+            // InternalVampireLanguage.g:1817:4: otherlv_1= '?' otherlv_2= '[' ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) ) (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )* otherlv_6= ']' otherlv_7= ':'

             {

             otherlv_1=(Token)match(input,73,FOLLOW_11); 

 

@@ -4777,13 +4815,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                                         newLeafNode(otherlv_2, grammarAccess.getVLSExistentialQuantifierAccess().getLeftSquareBracketKeyword_1_1());

                                 

-            // InternalVampireLanguage.g:1803:4: ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) )

-            // InternalVampireLanguage.g:1804:5: ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) )

+            // InternalVampireLanguage.g:1825:4: ( ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) ) )

+            // InternalVampireLanguage.g:1826:5: ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) )

             {

-            // InternalVampireLanguage.g:1804:5: ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) )

-            // InternalVampireLanguage.g:1805:6: (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration )

+            // InternalVampireLanguage.g:1826:5: ( (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration ) )

+            // InternalVampireLanguage.g:1827:6: (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration )

             {

-            // InternalVampireLanguage.g:1805:6: (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration )

+            // InternalVampireLanguage.g:1827:6: (lv_variables_3_1= ruleVLSVariable | lv_variables_3_2= ruleVLSVariableDeclaration )

             int alt27=2;

             int LA27_0 = input.LA(1);

 

@@ -4811,7 +4849,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
             }

             switch (alt27) {

                 case 1 :

-                    // InternalVampireLanguage.g:1806:7: lv_variables_3_1= ruleVLSVariable

+                    // InternalVampireLanguage.g:1828:7: lv_variables_3_1= ruleVLSVariable

                     {

 

                                                                         newCompositeNode(grammarAccess.getVLSExistentialQuantifierAccess().getVariablesVLSVariableParserRuleCall_1_2_0_0());

@@ -4836,7 +4874,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:1822:7: lv_variables_3_2= ruleVLSVariableDeclaration

+                    // InternalVampireLanguage.g:1844:7: lv_variables_3_2= ruleVLSVariableDeclaration

                     {

 

                                                                         newCompositeNode(grammarAccess.getVLSExistentialQuantifierAccess().getVariablesVLSVariableDeclarationParserRuleCall_1_2_0_1());

@@ -4869,7 +4907,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

             }

 

-            // InternalVampireLanguage.g:1840:4: (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )*

+            // InternalVampireLanguage.g:1862:4: (otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) ) )*

             loop29:

             do {

                 int alt29=2;

@@ -4882,19 +4920,19 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                 switch (alt29) {

                 case 1 :

-                    // InternalVampireLanguage.g:1841:5: otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) )

+                    // InternalVampireLanguage.g:1863:5: otherlv_4= ',' ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) )

                     {

                     otherlv_4=(Token)match(input,39,FOLLOW_40); 

 

                                                         newLeafNode(otherlv_4, grammarAccess.getVLSExistentialQuantifierAccess().getCommaKeyword_1_3_0());

                                                 

-                    // InternalVampireLanguage.g:1845:5: ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) )

-                    // InternalVampireLanguage.g:1846:6: ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) )

+                    // InternalVampireLanguage.g:1867:5: ( ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) ) )

+                    // InternalVampireLanguage.g:1868:6: ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) )

                     {

-                    // InternalVampireLanguage.g:1846:6: ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) )

-                    // InternalVampireLanguage.g:1847:7: (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration )

+                    // InternalVampireLanguage.g:1868:6: ( (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration ) )

+                    // InternalVampireLanguage.g:1869:7: (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration )

                     {

-                    // InternalVampireLanguage.g:1847:7: (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration )

+                    // InternalVampireLanguage.g:1869:7: (lv_variables_5_1= ruleVLSVariable | lv_variables_5_2= ruleVLSVariableDeclaration )

                     int alt28=2;

                     int LA28_0 = input.LA(1);

 

@@ -4922,7 +4960,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     switch (alt28) {

                         case 1 :

-                            // InternalVampireLanguage.g:1848:8: lv_variables_5_1= ruleVLSVariable

+                            // InternalVampireLanguage.g:1870:8: lv_variables_5_1= ruleVLSVariable

                             {

 

                                                                                         newCompositeNode(grammarAccess.getVLSExistentialQuantifierAccess().getVariablesVLSVariableParserRuleCall_1_3_1_0_0());

@@ -4947,7 +4985,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 2 :

-                            // InternalVampireLanguage.g:1864:8: lv_variables_5_2= ruleVLSVariableDeclaration

+                            // InternalVampireLanguage.g:1886:8: lv_variables_5_2= ruleVLSVariableDeclaration

                             {

 

                                                                                         newCompositeNode(grammarAccess.getVLSExistentialQuantifierAccess().getVariablesVLSVariableDeclarationParserRuleCall_1_3_1_0_1());

@@ -5000,11 +5038,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

             }

 

-            // InternalVampireLanguage.g:1892:3: ( (lv_operand_8_0= ruleVLSUnitaryFormula ) )

-            // InternalVampireLanguage.g:1893:4: (lv_operand_8_0= ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:1914:3: ( (lv_operand_8_0= ruleVLSUnitaryFormula ) )

+            // InternalVampireLanguage.g:1915:4: (lv_operand_8_0= ruleVLSUnitaryFormula )

             {

-            // InternalVampireLanguage.g:1893:4: (lv_operand_8_0= ruleVLSUnitaryFormula )

-            // InternalVampireLanguage.g:1894:5: lv_operand_8_0= ruleVLSUnitaryFormula

+            // InternalVampireLanguage.g:1915:4: (lv_operand_8_0= ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:1916:5: lv_operand_8_0= ruleVLSUnitaryFormula

             {

 

                                                 newCompositeNode(grammarAccess.getVLSExistentialQuantifierAccess().getOperandVLSUnitaryFormulaParserRuleCall_2_0());

@@ -5054,7 +5092,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSUnaryNegation"

-    // InternalVampireLanguage.g:1915:1: entryRuleVLSUnaryNegation returns [EObject current=null] : iv_ruleVLSUnaryNegation= ruleVLSUnaryNegation EOF ;

+    // InternalVampireLanguage.g:1937:1: entryRuleVLSUnaryNegation returns [EObject current=null] : iv_ruleVLSUnaryNegation= ruleVLSUnaryNegation EOF ;

     public final EObject entryRuleVLSUnaryNegation() throws RecognitionException {

         EObject current = null;

 

@@ -5062,8 +5100,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:1915:57: (iv_ruleVLSUnaryNegation= ruleVLSUnaryNegation EOF )

-            // InternalVampireLanguage.g:1916:2: iv_ruleVLSUnaryNegation= ruleVLSUnaryNegation EOF

+            // InternalVampireLanguage.g:1937:57: (iv_ruleVLSUnaryNegation= ruleVLSUnaryNegation EOF )

+            // InternalVampireLanguage.g:1938:2: iv_ruleVLSUnaryNegation= ruleVLSUnaryNegation EOF

             {

              newCompositeNode(grammarAccess.getVLSUnaryNegationRule()); 

             pushFollow(FOLLOW_1);

@@ -5090,7 +5128,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSUnaryNegation"

-    // InternalVampireLanguage.g:1922:1: ruleVLSUnaryNegation returns [EObject current=null] : ( () otherlv_1= '~' ( (lv_operand_2_0= ruleVLSUnitaryFormula ) ) ) ;

+    // InternalVampireLanguage.g:1944:1: ruleVLSUnaryNegation returns [EObject current=null] : ( () otherlv_1= '~' ( (lv_operand_2_0= ruleVLSUnitaryFormula ) ) ) ;

     public final EObject ruleVLSUnaryNegation() throws RecognitionException {

         EObject current = null;

 

@@ -5102,14 +5140,14 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:1928:2: ( ( () otherlv_1= '~' ( (lv_operand_2_0= ruleVLSUnitaryFormula ) ) ) )

-            // InternalVampireLanguage.g:1929:2: ( () otherlv_1= '~' ( (lv_operand_2_0= ruleVLSUnitaryFormula ) ) )

+            // InternalVampireLanguage.g:1950:2: ( ( () otherlv_1= '~' ( (lv_operand_2_0= ruleVLSUnitaryFormula ) ) ) )

+            // InternalVampireLanguage.g:1951:2: ( () otherlv_1= '~' ( (lv_operand_2_0= ruleVLSUnitaryFormula ) ) )

             {

-            // InternalVampireLanguage.g:1929:2: ( () otherlv_1= '~' ( (lv_operand_2_0= ruleVLSUnitaryFormula ) ) )

-            // InternalVampireLanguage.g:1930:3: () otherlv_1= '~' ( (lv_operand_2_0= ruleVLSUnitaryFormula ) )

+            // InternalVampireLanguage.g:1951:2: ( () otherlv_1= '~' ( (lv_operand_2_0= ruleVLSUnitaryFormula ) ) )

+            // InternalVampireLanguage.g:1952:3: () otherlv_1= '~' ( (lv_operand_2_0= ruleVLSUnitaryFormula ) )

             {

-            // InternalVampireLanguage.g:1930:3: ()

-            // InternalVampireLanguage.g:1931:4: 

+            // InternalVampireLanguage.g:1952:3: ()

+            // InternalVampireLanguage.g:1953:4: 

             {

 

                                         current = forceCreateModelElement(

@@ -5123,11 +5161,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                                 newLeafNode(otherlv_1, grammarAccess.getVLSUnaryNegationAccess().getTildeKeyword_1());

                         

-            // InternalVampireLanguage.g:1941:3: ( (lv_operand_2_0= ruleVLSUnitaryFormula ) )

-            // InternalVampireLanguage.g:1942:4: (lv_operand_2_0= ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:1963:3: ( (lv_operand_2_0= ruleVLSUnitaryFormula ) )

+            // InternalVampireLanguage.g:1964:4: (lv_operand_2_0= ruleVLSUnitaryFormula )

             {

-            // InternalVampireLanguage.g:1942:4: (lv_operand_2_0= ruleVLSUnitaryFormula )

-            // InternalVampireLanguage.g:1943:5: lv_operand_2_0= ruleVLSUnitaryFormula

+            // InternalVampireLanguage.g:1964:4: (lv_operand_2_0= ruleVLSUnitaryFormula )

+            // InternalVampireLanguage.g:1965:5: lv_operand_2_0= ruleVLSUnitaryFormula

             {

 

                                                 newCompositeNode(grammarAccess.getVLSUnaryNegationAccess().getOperandVLSUnitaryFormulaParserRuleCall_2_0());

@@ -5177,7 +5215,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSUnaryInfix"

-    // InternalVampireLanguage.g:1964:1: entryRuleVLSUnaryInfix returns [EObject current=null] : iv_ruleVLSUnaryInfix= ruleVLSUnaryInfix EOF ;

+    // InternalVampireLanguage.g:1986:1: entryRuleVLSUnaryInfix returns [EObject current=null] : iv_ruleVLSUnaryInfix= ruleVLSUnaryInfix EOF ;

     public final EObject entryRuleVLSUnaryInfix() throws RecognitionException {

         EObject current = null;

 

@@ -5185,8 +5223,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:1964:54: (iv_ruleVLSUnaryInfix= ruleVLSUnaryInfix EOF )

-            // InternalVampireLanguage.g:1965:2: iv_ruleVLSUnaryInfix= ruleVLSUnaryInfix EOF

+            // InternalVampireLanguage.g:1986:54: (iv_ruleVLSUnaryInfix= ruleVLSUnaryInfix EOF )

+            // InternalVampireLanguage.g:1987:2: iv_ruleVLSUnaryInfix= ruleVLSUnaryInfix EOF

             {

              newCompositeNode(grammarAccess.getVLSUnaryInfixRule()); 

             pushFollow(FOLLOW_1);

@@ -5213,7 +5251,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSUnaryInfix"

-    // InternalVampireLanguage.g:1971:1: ruleVLSUnaryInfix returns [EObject current=null] : (this_VLSAtomic_0= ruleVLSAtomic ( ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) ) ( (lv_right_7_0= ruleVLSAtomic ) ) )? ) ;

+    // InternalVampireLanguage.g:1993:1: ruleVLSUnaryInfix returns [EObject current=null] : (this_VLSAtomic_0= ruleVLSAtomic ( ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) ) ( (lv_right_7_0= ruleVLSAtomic ) ) )? ) ;

     public final EObject ruleVLSUnaryInfix() throws RecognitionException {

         EObject current = null;

 

@@ -5229,11 +5267,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:1977:2: ( (this_VLSAtomic_0= ruleVLSAtomic ( ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) ) ( (lv_right_7_0= ruleVLSAtomic ) ) )? ) )

-            // InternalVampireLanguage.g:1978:2: (this_VLSAtomic_0= ruleVLSAtomic ( ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) ) ( (lv_right_7_0= ruleVLSAtomic ) ) )? )

+            // InternalVampireLanguage.g:1999:2: ( (this_VLSAtomic_0= ruleVLSAtomic ( ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) ) ( (lv_right_7_0= ruleVLSAtomic ) ) )? ) )

+            // InternalVampireLanguage.g:2000:2: (this_VLSAtomic_0= ruleVLSAtomic ( ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) ) ( (lv_right_7_0= ruleVLSAtomic ) ) )? )

             {

-            // InternalVampireLanguage.g:1978:2: (this_VLSAtomic_0= ruleVLSAtomic ( ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) ) ( (lv_right_7_0= ruleVLSAtomic ) ) )? )

-            // InternalVampireLanguage.g:1979:3: this_VLSAtomic_0= ruleVLSAtomic ( ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) ) ( (lv_right_7_0= ruleVLSAtomic ) ) )?

+            // InternalVampireLanguage.g:2000:2: (this_VLSAtomic_0= ruleVLSAtomic ( ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) ) ( (lv_right_7_0= ruleVLSAtomic ) ) )? )

+            // InternalVampireLanguage.g:2001:3: this_VLSAtomic_0= ruleVLSAtomic ( ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) ) ( (lv_right_7_0= ruleVLSAtomic ) ) )?

             {

 

                                 newCompositeNode(grammarAccess.getVLSUnaryInfixAccess().getVLSAtomicParserRuleCall_0());

@@ -5247,7 +5285,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                                 current = this_VLSAtomic_0;

                                 afterParserOrEnumRuleCall();

                         

-            // InternalVampireLanguage.g:1987:3: ( ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) ) ( (lv_right_7_0= ruleVLSAtomic ) ) )?

+            // InternalVampireLanguage.g:2009:3: ( ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) ) ( (lv_right_7_0= ruleVLSAtomic ) ) )?

             int alt31=2;

             int LA31_0 = input.LA(1);

 

@@ -5256,9 +5294,9 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
             }

             switch (alt31) {

                 case 1 :

-                    // InternalVampireLanguage.g:1988:4: ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) ) ( (lv_right_7_0= ruleVLSAtomic ) )

+                    // InternalVampireLanguage.g:2010:4: ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) ) ( (lv_right_7_0= ruleVLSAtomic ) )

                     {

-                    // InternalVampireLanguage.g:1988:4: ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) )

+                    // InternalVampireLanguage.g:2010:4: ( ( () otherlv_2= '!=' ) | ( () otherlv_4= '=' ) | ( () otherlv_6= ':=' ) )

                     int alt30=3;

                     switch ( input.LA(1) ) {

                     case 75:

@@ -5285,13 +5323,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                     switch (alt30) {

                         case 1 :

-                            // InternalVampireLanguage.g:1989:5: ( () otherlv_2= '!=' )

+                            // InternalVampireLanguage.g:2011:5: ( () otherlv_2= '!=' )

                             {

-                            // InternalVampireLanguage.g:1989:5: ( () otherlv_2= '!=' )

-                            // InternalVampireLanguage.g:1990:6: () otherlv_2= '!='

+                            // InternalVampireLanguage.g:2011:5: ( () otherlv_2= '!=' )

+                            // InternalVampireLanguage.g:2012:6: () otherlv_2= '!='

                             {

-                            // InternalVampireLanguage.g:1990:6: ()

-                            // InternalVampireLanguage.g:1991:7: 

+                            // InternalVampireLanguage.g:2012:6: ()

+                            // InternalVampireLanguage.g:2013:7: 

                             {

 

                                                                                 current = forceCreateModelElementAndSet(

@@ -5312,13 +5350,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 2 :

-                            // InternalVampireLanguage.g:2003:5: ( () otherlv_4= '=' )

+                            // InternalVampireLanguage.g:2025:5: ( () otherlv_4= '=' )

                             {

-                            // InternalVampireLanguage.g:2003:5: ( () otherlv_4= '=' )

-                            // InternalVampireLanguage.g:2004:6: () otherlv_4= '='

+                            // InternalVampireLanguage.g:2025:5: ( () otherlv_4= '=' )

+                            // InternalVampireLanguage.g:2026:6: () otherlv_4= '='

                             {

-                            // InternalVampireLanguage.g:2004:6: ()

-                            // InternalVampireLanguage.g:2005:7: 

+                            // InternalVampireLanguage.g:2026:6: ()

+                            // InternalVampireLanguage.g:2027:7: 

                             {

 

                                                                                 current = forceCreateModelElementAndSet(

@@ -5339,13 +5377,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 3 :

-                            // InternalVampireLanguage.g:2017:5: ( () otherlv_6= ':=' )

+                            // InternalVampireLanguage.g:2039:5: ( () otherlv_6= ':=' )

                             {

-                            // InternalVampireLanguage.g:2017:5: ( () otherlv_6= ':=' )

-                            // InternalVampireLanguage.g:2018:6: () otherlv_6= ':='

+                            // InternalVampireLanguage.g:2039:5: ( () otherlv_6= ':=' )

+                            // InternalVampireLanguage.g:2040:6: () otherlv_6= ':='

                             {

-                            // InternalVampireLanguage.g:2018:6: ()

-                            // InternalVampireLanguage.g:2019:7: 

+                            // InternalVampireLanguage.g:2040:6: ()

+                            // InternalVampireLanguage.g:2041:7: 

                             {

 

                                                                                 current = forceCreateModelElementAndSet(

@@ -5368,11 +5406,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                     }

 

-                    // InternalVampireLanguage.g:2031:4: ( (lv_right_7_0= ruleVLSAtomic ) )

-                    // InternalVampireLanguage.g:2032:5: (lv_right_7_0= ruleVLSAtomic )

+                    // InternalVampireLanguage.g:2053:4: ( (lv_right_7_0= ruleVLSAtomic ) )

+                    // InternalVampireLanguage.g:2054:5: (lv_right_7_0= ruleVLSAtomic )

                     {

-                    // InternalVampireLanguage.g:2032:5: (lv_right_7_0= ruleVLSAtomic )

-                    // InternalVampireLanguage.g:2033:6: lv_right_7_0= ruleVLSAtomic

+                    // InternalVampireLanguage.g:2054:5: (lv_right_7_0= ruleVLSAtomic )

+                    // InternalVampireLanguage.g:2055:6: lv_right_7_0= ruleVLSAtomic

                     {

 

                                                                 newCompositeNode(grammarAccess.getVLSUnaryInfixAccess().getRightVLSAtomicParserRuleCall_1_1_0());

@@ -5428,7 +5466,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSAtomic"

-    // InternalVampireLanguage.g:2055:1: entryRuleVLSAtomic returns [EObject current=null] : iv_ruleVLSAtomic= ruleVLSAtomic EOF ;

+    // InternalVampireLanguage.g:2077:1: entryRuleVLSAtomic returns [EObject current=null] : iv_ruleVLSAtomic= ruleVLSAtomic EOF ;

     public final EObject entryRuleVLSAtomic() throws RecognitionException {

         EObject current = null;

 

@@ -5436,8 +5474,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:2055:50: (iv_ruleVLSAtomic= ruleVLSAtomic EOF )

-            // InternalVampireLanguage.g:2056:2: iv_ruleVLSAtomic= ruleVLSAtomic EOF

+            // InternalVampireLanguage.g:2077:50: (iv_ruleVLSAtomic= ruleVLSAtomic EOF )

+            // InternalVampireLanguage.g:2078:2: iv_ruleVLSAtomic= ruleVLSAtomic EOF

             {

              newCompositeNode(grammarAccess.getVLSAtomicRule()); 

             pushFollow(FOLLOW_1);

@@ -5464,7 +5502,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSAtomic"

-    // InternalVampireLanguage.g:2062:1: ruleVLSAtomic returns [EObject current=null] : (this_VLSAtomicConstant_0= ruleVLSAtomicConstant | this_VLSAtomicFunction_1= ruleVLSAtomicFunction | this_VLSVariable_2= ruleVLSVariable | this_VLSDefinedTerm_3= ruleVLSDefinedTerm ) ;

+    // InternalVampireLanguage.g:2084:1: ruleVLSAtomic returns [EObject current=null] : (this_VLSAtomicConstant_0= ruleVLSAtomicConstant | this_VLSAtomicFunction_1= ruleVLSAtomicFunction | this_VLSVariable_2= ruleVLSVariable | this_VLSDefinedTerm_3= ruleVLSDefinedTerm ) ;

     public final EObject ruleVLSAtomic() throws RecognitionException {

         EObject current = null;

 

@@ -5481,15 +5519,15 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:2068:2: ( (this_VLSAtomicConstant_0= ruleVLSAtomicConstant | this_VLSAtomicFunction_1= ruleVLSAtomicFunction | this_VLSVariable_2= ruleVLSVariable | this_VLSDefinedTerm_3= ruleVLSDefinedTerm ) )

-            // InternalVampireLanguage.g:2069:2: (this_VLSAtomicConstant_0= ruleVLSAtomicConstant | this_VLSAtomicFunction_1= ruleVLSAtomicFunction | this_VLSVariable_2= ruleVLSVariable | this_VLSDefinedTerm_3= ruleVLSDefinedTerm )

+            // InternalVampireLanguage.g:2090:2: ( (this_VLSAtomicConstant_0= ruleVLSAtomicConstant | this_VLSAtomicFunction_1= ruleVLSAtomicFunction | this_VLSVariable_2= ruleVLSVariable | this_VLSDefinedTerm_3= ruleVLSDefinedTerm ) )

+            // InternalVampireLanguage.g:2091:2: (this_VLSAtomicConstant_0= ruleVLSAtomicConstant | this_VLSAtomicFunction_1= ruleVLSAtomicFunction | this_VLSVariable_2= ruleVLSVariable | this_VLSDefinedTerm_3= ruleVLSDefinedTerm )

             {

-            // InternalVampireLanguage.g:2069:2: (this_VLSAtomicConstant_0= ruleVLSAtomicConstant | this_VLSAtomicFunction_1= ruleVLSAtomicFunction | this_VLSVariable_2= ruleVLSVariable | this_VLSDefinedTerm_3= ruleVLSDefinedTerm )

+            // InternalVampireLanguage.g:2091:2: (this_VLSAtomicConstant_0= ruleVLSAtomicConstant | this_VLSAtomicFunction_1= ruleVLSAtomicFunction | this_VLSVariable_2= ruleVLSVariable | this_VLSDefinedTerm_3= ruleVLSDefinedTerm )

             int alt32=4;

             alt32 = dfa32.predict(input);

             switch (alt32) {

                 case 1 :

-                    // InternalVampireLanguage.g:2070:3: this_VLSAtomicConstant_0= ruleVLSAtomicConstant

+                    // InternalVampireLanguage.g:2092:3: this_VLSAtomicConstant_0= ruleVLSAtomicConstant

                     {

 

                                         newCompositeNode(grammarAccess.getVLSAtomicAccess().getVLSAtomicConstantParserRuleCall_0());

@@ -5507,7 +5545,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:2079:3: this_VLSAtomicFunction_1= ruleVLSAtomicFunction

+                    // InternalVampireLanguage.g:2101:3: this_VLSAtomicFunction_1= ruleVLSAtomicFunction

                     {

 

                                         newCompositeNode(grammarAccess.getVLSAtomicAccess().getVLSAtomicFunctionParserRuleCall_1());

@@ -5525,7 +5563,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 3 :

-                    // InternalVampireLanguage.g:2088:3: this_VLSVariable_2= ruleVLSVariable

+                    // InternalVampireLanguage.g:2110:3: this_VLSVariable_2= ruleVLSVariable

                     {

 

                                         newCompositeNode(grammarAccess.getVLSAtomicAccess().getVLSVariableParserRuleCall_2());

@@ -5543,7 +5581,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 4 :

-                    // InternalVampireLanguage.g:2097:3: this_VLSDefinedTerm_3= ruleVLSDefinedTerm

+                    // InternalVampireLanguage.g:2119:3: this_VLSDefinedTerm_3= ruleVLSDefinedTerm

                     {

 

                                         newCompositeNode(grammarAccess.getVLSAtomicAccess().getVLSDefinedTermParserRuleCall_3());

@@ -5583,7 +5621,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSAtomicConstant"

-    // InternalVampireLanguage.g:2109:1: entryRuleVLSAtomicConstant returns [EObject current=null] : iv_ruleVLSAtomicConstant= ruleVLSAtomicConstant EOF ;

+    // InternalVampireLanguage.g:2131:1: entryRuleVLSAtomicConstant returns [EObject current=null] : iv_ruleVLSAtomicConstant= ruleVLSAtomicConstant EOF ;

     public final EObject entryRuleVLSAtomicConstant() throws RecognitionException {

         EObject current = null;

 

@@ -5591,8 +5629,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:2109:58: (iv_ruleVLSAtomicConstant= ruleVLSAtomicConstant EOF )

-            // InternalVampireLanguage.g:2110:2: iv_ruleVLSAtomicConstant= ruleVLSAtomicConstant EOF

+            // InternalVampireLanguage.g:2131:58: (iv_ruleVLSAtomicConstant= ruleVLSAtomicConstant EOF )

+            // InternalVampireLanguage.g:2132:2: iv_ruleVLSAtomicConstant= ruleVLSAtomicConstant EOF

             {

              newCompositeNode(grammarAccess.getVLSAtomicConstantRule()); 

             pushFollow(FOLLOW_1);

@@ -5619,7 +5657,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSAtomicConstant"

-    // InternalVampireLanguage.g:2116:1: ruleVLSAtomicConstant returns [EObject current=null] : ( ( () ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) ) ) | ( () otherlv_3= '$true' ) | ( () otherlv_5= '$false' ) ) ;

+    // InternalVampireLanguage.g:2138:1: ruleVLSAtomicConstant returns [EObject current=null] : ( ( () ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) ) ) | ( () otherlv_3= '$true' ) | ( () otherlv_5= '$false' ) ) ;

     public final EObject ruleVLSAtomicConstant() throws RecognitionException {

         EObject current = null;

 

@@ -5636,10 +5674,10 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:2122:2: ( ( ( () ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) ) ) | ( () otherlv_3= '$true' ) | ( () otherlv_5= '$false' ) ) )

-            // InternalVampireLanguage.g:2123:2: ( ( () ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) ) ) | ( () otherlv_3= '$true' ) | ( () otherlv_5= '$false' ) )

+            // InternalVampireLanguage.g:2144:2: ( ( ( () ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) ) ) | ( () otherlv_3= '$true' ) | ( () otherlv_5= '$false' ) ) )

+            // InternalVampireLanguage.g:2145:2: ( ( () ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) ) ) | ( () otherlv_3= '$true' ) | ( () otherlv_5= '$false' ) )

             {

-            // InternalVampireLanguage.g:2123:2: ( ( () ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) ) ) | ( () otherlv_3= '$true' ) | ( () otherlv_5= '$false' ) )

+            // InternalVampireLanguage.g:2145:2: ( ( () ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) ) ) | ( () otherlv_3= '$true' ) | ( () otherlv_5= '$false' ) )

             int alt34=3;

             switch ( input.LA(1) ) {

             case RULE_LOWER_WORD_ID:

@@ -5684,13 +5722,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

             switch (alt34) {

                 case 1 :

-                    // InternalVampireLanguage.g:2124:3: ( () ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) ) )

+                    // InternalVampireLanguage.g:2146:3: ( () ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) ) )

                     {

-                    // InternalVampireLanguage.g:2124:3: ( () ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) ) )

-                    // InternalVampireLanguage.g:2125:4: () ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) )

+                    // InternalVampireLanguage.g:2146:3: ( () ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) ) )

+                    // InternalVampireLanguage.g:2147:4: () ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) )

                     {

-                    // InternalVampireLanguage.g:2125:4: ()

-                    // InternalVampireLanguage.g:2126:5: 

+                    // InternalVampireLanguage.g:2147:4: ()

+                    // InternalVampireLanguage.g:2148:5: 

                     {

 

                                                         current = forceCreateModelElement(

@@ -5700,13 +5738,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                     }

 

-                    // InternalVampireLanguage.g:2132:4: ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) )

-                    // InternalVampireLanguage.g:2133:5: ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) )

+                    // InternalVampireLanguage.g:2154:4: ( ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) ) )

+                    // InternalVampireLanguage.g:2155:5: ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) )

                     {

-                    // InternalVampireLanguage.g:2133:5: ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) )

-                    // InternalVampireLanguage.g:2134:6: (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole )

+                    // InternalVampireLanguage.g:2155:5: ( (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole ) )

+                    // InternalVampireLanguage.g:2156:6: (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole )

                     {

-                    // InternalVampireLanguage.g:2134:6: (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole )

+                    // InternalVampireLanguage.g:2156:6: (lv_name_1_1= RULE_LOWER_WORD_ID | lv_name_1_2= RULE_SINGLE_QUOTE | lv_name_1_3= RULE_DOLLAR_ID | lv_name_1_4= RULE_DOUBLE_DOLLAR_ID | lv_name_1_5= ruleVLSRole )

                     int alt33=5;

                     switch ( input.LA(1) ) {

                     case RULE_LOWER_WORD_ID:

@@ -5757,7 +5795,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                     switch (alt33) {

                         case 1 :

-                            // InternalVampireLanguage.g:2135:7: lv_name_1_1= RULE_LOWER_WORD_ID

+                            // InternalVampireLanguage.g:2157:7: lv_name_1_1= RULE_LOWER_WORD_ID

                             {

                             lv_name_1_1=(Token)match(input,RULE_LOWER_WORD_ID,FOLLOW_2); 

 

@@ -5777,7 +5815,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 2 :

-                            // InternalVampireLanguage.g:2150:7: lv_name_1_2= RULE_SINGLE_QUOTE

+                            // InternalVampireLanguage.g:2172:7: lv_name_1_2= RULE_SINGLE_QUOTE

                             {

                             lv_name_1_2=(Token)match(input,RULE_SINGLE_QUOTE,FOLLOW_2); 

 

@@ -5797,7 +5835,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 3 :

-                            // InternalVampireLanguage.g:2165:7: lv_name_1_3= RULE_DOLLAR_ID

+                            // InternalVampireLanguage.g:2187:7: lv_name_1_3= RULE_DOLLAR_ID

                             {

                             lv_name_1_3=(Token)match(input,RULE_DOLLAR_ID,FOLLOW_2); 

 

@@ -5817,7 +5855,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 4 :

-                            // InternalVampireLanguage.g:2180:7: lv_name_1_4= RULE_DOUBLE_DOLLAR_ID

+                            // InternalVampireLanguage.g:2202:7: lv_name_1_4= RULE_DOUBLE_DOLLAR_ID

                             {

                             lv_name_1_4=(Token)match(input,RULE_DOUBLE_DOLLAR_ID,FOLLOW_2); 

 

@@ -5837,7 +5875,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 5 :

-                            // InternalVampireLanguage.g:2195:7: lv_name_1_5= ruleVLSRole

+                            // InternalVampireLanguage.g:2217:7: lv_name_1_5= ruleVLSRole

                             {

 

                                                                                 newCompositeNode(grammarAccess.getVLSAtomicConstantAccess().getNameVLSRoleParserRuleCall_0_1_0_4());

@@ -5877,13 +5915,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:2215:3: ( () otherlv_3= '$true' )

+                    // InternalVampireLanguage.g:2237:3: ( () otherlv_3= '$true' )

                     {

-                    // InternalVampireLanguage.g:2215:3: ( () otherlv_3= '$true' )

-                    // InternalVampireLanguage.g:2216:4: () otherlv_3= '$true'

+                    // InternalVampireLanguage.g:2237:3: ( () otherlv_3= '$true' )

+                    // InternalVampireLanguage.g:2238:4: () otherlv_3= '$true'

                     {

-                    // InternalVampireLanguage.g:2216:4: ()

-                    // InternalVampireLanguage.g:2217:5: 

+                    // InternalVampireLanguage.g:2238:4: ()

+                    // InternalVampireLanguage.g:2239:5: 

                     {

 

                                                         current = forceCreateModelElement(

@@ -5904,13 +5942,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 3 :

-                    // InternalVampireLanguage.g:2229:3: ( () otherlv_5= '$false' )

+                    // InternalVampireLanguage.g:2251:3: ( () otherlv_5= '$false' )

                     {

-                    // InternalVampireLanguage.g:2229:3: ( () otherlv_5= '$false' )

-                    // InternalVampireLanguage.g:2230:4: () otherlv_5= '$false'

+                    // InternalVampireLanguage.g:2251:3: ( () otherlv_5= '$false' )

+                    // InternalVampireLanguage.g:2252:4: () otherlv_5= '$false'

                     {

-                    // InternalVampireLanguage.g:2230:4: ()

-                    // InternalVampireLanguage.g:2231:5: 

+                    // InternalVampireLanguage.g:2252:4: ()

+                    // InternalVampireLanguage.g:2253:5: 

                     {

 

                                                         current = forceCreateModelElement(

@@ -5953,7 +5991,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSAtomicFunction"

-    // InternalVampireLanguage.g:2246:1: entryRuleVLSAtomicFunction returns [EObject current=null] : iv_ruleVLSAtomicFunction= ruleVLSAtomicFunction EOF ;

+    // InternalVampireLanguage.g:2268:1: entryRuleVLSAtomicFunction returns [EObject current=null] : iv_ruleVLSAtomicFunction= ruleVLSAtomicFunction EOF ;

     public final EObject entryRuleVLSAtomicFunction() throws RecognitionException {

         EObject current = null;

 

@@ -5961,8 +5999,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:2246:58: (iv_ruleVLSAtomicFunction= ruleVLSAtomicFunction EOF )

-            // InternalVampireLanguage.g:2247:2: iv_ruleVLSAtomicFunction= ruleVLSAtomicFunction EOF

+            // InternalVampireLanguage.g:2268:58: (iv_ruleVLSAtomicFunction= ruleVLSAtomicFunction EOF )

+            // InternalVampireLanguage.g:2269:2: iv_ruleVLSAtomicFunction= ruleVLSAtomicFunction EOF

             {

              newCompositeNode(grammarAccess.getVLSAtomicFunctionRule()); 

             pushFollow(FOLLOW_1);

@@ -5989,7 +6027,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSAtomicFunction"

-    // InternalVampireLanguage.g:2253:1: ruleVLSAtomicFunction returns [EObject current=null] : ( ( () ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) ) (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' ) ) | ( () ( (lv_name_8_0= '$less' ) ) otherlv_9= '(' ( (lv_terms_10_0= ruleVLSFofTerm ) ) otherlv_11= ',' ( (lv_terms_12_0= ruleVLSFofTerm ) ) otherlv_13= ')' ) ) ;

+    // InternalVampireLanguage.g:2275:1: ruleVLSAtomicFunction returns [EObject current=null] : ( ( () ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) ) (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' ) ) | ( () ( (lv_name_8_0= '$less' ) ) otherlv_9= '(' ( (lv_terms_10_0= ruleVLSFofTerm ) ) otherlv_11= ',' ( (lv_terms_12_0= ruleVLSFofTerm ) ) otherlv_13= ')' ) ) ;

     public final EObject ruleVLSAtomicFunction() throws RecognitionException {

         EObject current = null;

 

@@ -6019,10 +6057,10 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:2259:2: ( ( ( () ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) ) (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' ) ) | ( () ( (lv_name_8_0= '$less' ) ) otherlv_9= '(' ( (lv_terms_10_0= ruleVLSFofTerm ) ) otherlv_11= ',' ( (lv_terms_12_0= ruleVLSFofTerm ) ) otherlv_13= ')' ) ) )

-            // InternalVampireLanguage.g:2260:2: ( ( () ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) ) (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' ) ) | ( () ( (lv_name_8_0= '$less' ) ) otherlv_9= '(' ( (lv_terms_10_0= ruleVLSFofTerm ) ) otherlv_11= ',' ( (lv_terms_12_0= ruleVLSFofTerm ) ) otherlv_13= ')' ) )

+            // InternalVampireLanguage.g:2281:2: ( ( ( () ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) ) (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' ) ) | ( () ( (lv_name_8_0= '$less' ) ) otherlv_9= '(' ( (lv_terms_10_0= ruleVLSFofTerm ) ) otherlv_11= ',' ( (lv_terms_12_0= ruleVLSFofTerm ) ) otherlv_13= ')' ) ) )

+            // InternalVampireLanguage.g:2282:2: ( ( () ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) ) (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' ) ) | ( () ( (lv_name_8_0= '$less' ) ) otherlv_9= '(' ( (lv_terms_10_0= ruleVLSFofTerm ) ) otherlv_11= ',' ( (lv_terms_12_0= ruleVLSFofTerm ) ) otherlv_13= ')' ) )

             {

-            // InternalVampireLanguage.g:2260:2: ( ( () ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) ) (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' ) ) | ( () ( (lv_name_8_0= '$less' ) ) otherlv_9= '(' ( (lv_terms_10_0= ruleVLSFofTerm ) ) otherlv_11= ',' ( (lv_terms_12_0= ruleVLSFofTerm ) ) otherlv_13= ')' ) )

+            // InternalVampireLanguage.g:2282:2: ( ( () ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) ) (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' ) ) | ( () ( (lv_name_8_0= '$less' ) ) otherlv_9= '(' ( (lv_terms_10_0= ruleVLSFofTerm ) ) otherlv_11= ',' ( (lv_terms_12_0= ruleVLSFofTerm ) ) otherlv_13= ')' ) )

             int alt37=2;

             int LA37_0 = input.LA(1);

 

@@ -6040,13 +6078,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
             }

             switch (alt37) {

                 case 1 :

-                    // InternalVampireLanguage.g:2261:3: ( () ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) ) (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' ) )

+                    // InternalVampireLanguage.g:2283:3: ( () ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) ) (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' ) )

                     {

-                    // InternalVampireLanguage.g:2261:3: ( () ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) ) (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' ) )

-                    // InternalVampireLanguage.g:2262:4: () ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) ) (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' )

+                    // InternalVampireLanguage.g:2283:3: ( () ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) ) (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' ) )

+                    // InternalVampireLanguage.g:2284:4: () ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) ) (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' )

                     {

-                    // InternalVampireLanguage.g:2262:4: ()

-                    // InternalVampireLanguage.g:2263:5: 

+                    // InternalVampireLanguage.g:2284:4: ()

+                    // InternalVampireLanguage.g:2285:5: 

                     {

 

                                                         current = forceCreateModelElement(

@@ -6056,13 +6094,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                     }

 

-                    // InternalVampireLanguage.g:2269:4: ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) )

-                    // InternalVampireLanguage.g:2270:5: ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) )

+                    // InternalVampireLanguage.g:2291:4: ( ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) ) )

+                    // InternalVampireLanguage.g:2292:5: ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) )

                     {

-                    // InternalVampireLanguage.g:2270:5: ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) )

-                    // InternalVampireLanguage.g:2271:6: (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole )

+                    // InternalVampireLanguage.g:2292:5: ( (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole ) )

+                    // InternalVampireLanguage.g:2293:6: (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole )

                     {

-                    // InternalVampireLanguage.g:2271:6: (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole )

+                    // InternalVampireLanguage.g:2293:6: (lv_constant_1_1= RULE_LOWER_WORD_ID | lv_constant_1_2= RULE_SINGLE_QUOTE | lv_constant_1_3= RULE_DOLLAR_ID | lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID | lv_constant_1_5= ruleVLSRole )

                     int alt35=5;

                     switch ( input.LA(1) ) {

                     case RULE_LOWER_WORD_ID:

@@ -6113,7 +6151,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                     switch (alt35) {

                         case 1 :

-                            // InternalVampireLanguage.g:2272:7: lv_constant_1_1= RULE_LOWER_WORD_ID

+                            // InternalVampireLanguage.g:2294:7: lv_constant_1_1= RULE_LOWER_WORD_ID

                             {

                             lv_constant_1_1=(Token)match(input,RULE_LOWER_WORD_ID,FOLLOW_16); 

 

@@ -6133,7 +6171,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 2 :

-                            // InternalVampireLanguage.g:2287:7: lv_constant_1_2= RULE_SINGLE_QUOTE

+                            // InternalVampireLanguage.g:2309:7: lv_constant_1_2= RULE_SINGLE_QUOTE

                             {

                             lv_constant_1_2=(Token)match(input,RULE_SINGLE_QUOTE,FOLLOW_16); 

 

@@ -6153,7 +6191,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 3 :

-                            // InternalVampireLanguage.g:2302:7: lv_constant_1_3= RULE_DOLLAR_ID

+                            // InternalVampireLanguage.g:2324:7: lv_constant_1_3= RULE_DOLLAR_ID

                             {

                             lv_constant_1_3=(Token)match(input,RULE_DOLLAR_ID,FOLLOW_16); 

 

@@ -6173,7 +6211,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 4 :

-                            // InternalVampireLanguage.g:2317:7: lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID

+                            // InternalVampireLanguage.g:2339:7: lv_constant_1_4= RULE_DOUBLE_DOLLAR_ID

                             {

                             lv_constant_1_4=(Token)match(input,RULE_DOUBLE_DOLLAR_ID,FOLLOW_16); 

 

@@ -6193,7 +6231,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                             }

                             break;

                         case 5 :

-                            // InternalVampireLanguage.g:2332:7: lv_constant_1_5= ruleVLSRole

+                            // InternalVampireLanguage.g:2354:7: lv_constant_1_5= ruleVLSRole

                             {

 

                                                                                 newCompositeNode(grammarAccess.getVLSAtomicFunctionAccess().getConstantVLSRoleParserRuleCall_0_1_0_4());

@@ -6226,18 +6264,18 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                     }

 

-                    // InternalVampireLanguage.g:2350:4: (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' )

-                    // InternalVampireLanguage.g:2351:5: otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')'

+                    // InternalVampireLanguage.g:2372:4: (otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')' )

+                    // InternalVampireLanguage.g:2373:5: otherlv_2= '(' ( (lv_terms_3_0= ruleVLSFofTerm ) ) (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )* otherlv_6= ')'

                     {

                     otherlv_2=(Token)match(input,38,FOLLOW_33); 

 

                                                         newLeafNode(otherlv_2, grammarAccess.getVLSAtomicFunctionAccess().getLeftParenthesisKeyword_0_2_0());

                                                 

-                    // InternalVampireLanguage.g:2355:5: ( (lv_terms_3_0= ruleVLSFofTerm ) )

-                    // InternalVampireLanguage.g:2356:6: (lv_terms_3_0= ruleVLSFofTerm )

+                    // InternalVampireLanguage.g:2377:5: ( (lv_terms_3_0= ruleVLSFofTerm ) )

+                    // InternalVampireLanguage.g:2378:6: (lv_terms_3_0= ruleVLSFofTerm )

                     {

-                    // InternalVampireLanguage.g:2356:6: (lv_terms_3_0= ruleVLSFofTerm )

-                    // InternalVampireLanguage.g:2357:7: lv_terms_3_0= ruleVLSFofTerm

+                    // InternalVampireLanguage.g:2378:6: (lv_terms_3_0= ruleVLSFofTerm )

+                    // InternalVampireLanguage.g:2379:7: lv_terms_3_0= ruleVLSFofTerm

                     {

 

                                                                         newCompositeNode(grammarAccess.getVLSAtomicFunctionAccess().getTermsVLSFofTermParserRuleCall_0_2_1_0());

@@ -6264,7 +6302,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                     }

 

-                    // InternalVampireLanguage.g:2374:5: (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )*

+                    // InternalVampireLanguage.g:2396:5: (otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) ) )*

                     loop36:

                     do {

                         int alt36=2;

@@ -6277,17 +6315,17 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                         switch (alt36) {

                         case 1 :

-                            // InternalVampireLanguage.g:2375:6: otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) )

+                            // InternalVampireLanguage.g:2397:6: otherlv_4= ',' ( (lv_terms_5_0= ruleVLSFofTerm ) )

                             {

                             otherlv_4=(Token)match(input,39,FOLLOW_33); 

 

                                                                         newLeafNode(otherlv_4, grammarAccess.getVLSAtomicFunctionAccess().getCommaKeyword_0_2_2_0());

                                                                 

-                            // InternalVampireLanguage.g:2379:6: ( (lv_terms_5_0= ruleVLSFofTerm ) )

-                            // InternalVampireLanguage.g:2380:7: (lv_terms_5_0= ruleVLSFofTerm )

+                            // InternalVampireLanguage.g:2401:6: ( (lv_terms_5_0= ruleVLSFofTerm ) )

+                            // InternalVampireLanguage.g:2402:7: (lv_terms_5_0= ruleVLSFofTerm )

                             {

-                            // InternalVampireLanguage.g:2380:7: (lv_terms_5_0= ruleVLSFofTerm )

-                            // InternalVampireLanguage.g:2381:8: lv_terms_5_0= ruleVLSFofTerm

+                            // InternalVampireLanguage.g:2402:7: (lv_terms_5_0= ruleVLSFofTerm )

+                            // InternalVampireLanguage.g:2403:8: lv_terms_5_0= ruleVLSFofTerm

                             {

 

                                                                                         newCompositeNode(grammarAccess.getVLSAtomicFunctionAccess().getTermsVLSFofTermParserRuleCall_0_2_2_1_0());

@@ -6337,13 +6375,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:2406:3: ( () ( (lv_name_8_0= '$less' ) ) otherlv_9= '(' ( (lv_terms_10_0= ruleVLSFofTerm ) ) otherlv_11= ',' ( (lv_terms_12_0= ruleVLSFofTerm ) ) otherlv_13= ')' )

+                    // InternalVampireLanguage.g:2428:3: ( () ( (lv_name_8_0= '$less' ) ) otherlv_9= '(' ( (lv_terms_10_0= ruleVLSFofTerm ) ) otherlv_11= ',' ( (lv_terms_12_0= ruleVLSFofTerm ) ) otherlv_13= ')' )

                     {

-                    // InternalVampireLanguage.g:2406:3: ( () ( (lv_name_8_0= '$less' ) ) otherlv_9= '(' ( (lv_terms_10_0= ruleVLSFofTerm ) ) otherlv_11= ',' ( (lv_terms_12_0= ruleVLSFofTerm ) ) otherlv_13= ')' )

-                    // InternalVampireLanguage.g:2407:4: () ( (lv_name_8_0= '$less' ) ) otherlv_9= '(' ( (lv_terms_10_0= ruleVLSFofTerm ) ) otherlv_11= ',' ( (lv_terms_12_0= ruleVLSFofTerm ) ) otherlv_13= ')'

+                    // InternalVampireLanguage.g:2428:3: ( () ( (lv_name_8_0= '$less' ) ) otherlv_9= '(' ( (lv_terms_10_0= ruleVLSFofTerm ) ) otherlv_11= ',' ( (lv_terms_12_0= ruleVLSFofTerm ) ) otherlv_13= ')' )

+                    // InternalVampireLanguage.g:2429:4: () ( (lv_name_8_0= '$less' ) ) otherlv_9= '(' ( (lv_terms_10_0= ruleVLSFofTerm ) ) otherlv_11= ',' ( (lv_terms_12_0= ruleVLSFofTerm ) ) otherlv_13= ')'

                     {

-                    // InternalVampireLanguage.g:2407:4: ()

-                    // InternalVampireLanguage.g:2408:5: 

+                    // InternalVampireLanguage.g:2429:4: ()

+                    // InternalVampireLanguage.g:2430:5: 

                     {

 

                                                         current = forceCreateModelElement(

@@ -6353,11 +6391,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                     }

 

-                    // InternalVampireLanguage.g:2414:4: ( (lv_name_8_0= '$less' ) )

-                    // InternalVampireLanguage.g:2415:5: (lv_name_8_0= '$less' )

+                    // InternalVampireLanguage.g:2436:4: ( (lv_name_8_0= '$less' ) )

+                    // InternalVampireLanguage.g:2437:5: (lv_name_8_0= '$less' )

                     {

-                    // InternalVampireLanguage.g:2415:5: (lv_name_8_0= '$less' )

-                    // InternalVampireLanguage.g:2416:6: lv_name_8_0= '$less'

+                    // InternalVampireLanguage.g:2437:5: (lv_name_8_0= '$less' )

+                    // InternalVampireLanguage.g:2438:6: lv_name_8_0= '$less'

                     {

                     lv_name_8_0=(Token)match(input,80,FOLLOW_16); 

 

@@ -6379,11 +6417,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                                                 newLeafNode(otherlv_9, grammarAccess.getVLSAtomicFunctionAccess().getLeftParenthesisKeyword_1_2());

                                         

-                    // InternalVampireLanguage.g:2432:4: ( (lv_terms_10_0= ruleVLSFofTerm ) )

-                    // InternalVampireLanguage.g:2433:5: (lv_terms_10_0= ruleVLSFofTerm )

+                    // InternalVampireLanguage.g:2454:4: ( (lv_terms_10_0= ruleVLSFofTerm ) )

+                    // InternalVampireLanguage.g:2455:5: (lv_terms_10_0= ruleVLSFofTerm )

                     {

-                    // InternalVampireLanguage.g:2433:5: (lv_terms_10_0= ruleVLSFofTerm )

-                    // InternalVampireLanguage.g:2434:6: lv_terms_10_0= ruleVLSFofTerm

+                    // InternalVampireLanguage.g:2455:5: (lv_terms_10_0= ruleVLSFofTerm )

+                    // InternalVampireLanguage.g:2456:6: lv_terms_10_0= ruleVLSFofTerm

                     {

 

                                                                 newCompositeNode(grammarAccess.getVLSAtomicFunctionAccess().getTermsVLSFofTermParserRuleCall_1_3_0());

@@ -6414,11 +6452,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                                                 newLeafNode(otherlv_11, grammarAccess.getVLSAtomicFunctionAccess().getCommaKeyword_1_4());

                                         

-                    // InternalVampireLanguage.g:2455:4: ( (lv_terms_12_0= ruleVLSFofTerm ) )

-                    // InternalVampireLanguage.g:2456:5: (lv_terms_12_0= ruleVLSFofTerm )

+                    // InternalVampireLanguage.g:2477:4: ( (lv_terms_12_0= ruleVLSFofTerm ) )

+                    // InternalVampireLanguage.g:2478:5: (lv_terms_12_0= ruleVLSFofTerm )

                     {

-                    // InternalVampireLanguage.g:2456:5: (lv_terms_12_0= ruleVLSFofTerm )

-                    // InternalVampireLanguage.g:2457:6: lv_terms_12_0= ruleVLSFofTerm

+                    // InternalVampireLanguage.g:2478:5: (lv_terms_12_0= ruleVLSFofTerm )

+                    // InternalVampireLanguage.g:2479:6: lv_terms_12_0= ruleVLSFofTerm

                     {

 

                                                                 newCompositeNode(grammarAccess.getVLSAtomicFunctionAccess().getTermsVLSFofTermParserRuleCall_1_5_0());

@@ -6478,7 +6516,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSVariable"

-    // InternalVampireLanguage.g:2483:1: entryRuleVLSVariable returns [EObject current=null] : iv_ruleVLSVariable= ruleVLSVariable EOF ;

+    // InternalVampireLanguage.g:2505:1: entryRuleVLSVariable returns [EObject current=null] : iv_ruleVLSVariable= ruleVLSVariable EOF ;

     public final EObject entryRuleVLSVariable() throws RecognitionException {

         EObject current = null;

 

@@ -6486,8 +6524,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:2483:52: (iv_ruleVLSVariable= ruleVLSVariable EOF )

-            // InternalVampireLanguage.g:2484:2: iv_ruleVLSVariable= ruleVLSVariable EOF

+            // InternalVampireLanguage.g:2505:52: (iv_ruleVLSVariable= ruleVLSVariable EOF )

+            // InternalVampireLanguage.g:2506:2: iv_ruleVLSVariable= ruleVLSVariable EOF

             {

              newCompositeNode(grammarAccess.getVLSVariableRule()); 

             pushFollow(FOLLOW_1);

@@ -6514,7 +6552,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSVariable"

-    // InternalVampireLanguage.g:2490:1: ruleVLSVariable returns [EObject current=null] : ( (lv_name_0_0= RULE_UPPER_WORD_ID ) ) ;

+    // InternalVampireLanguage.g:2512:1: ruleVLSVariable returns [EObject current=null] : ( (lv_name_0_0= RULE_UPPER_WORD_ID ) ) ;

     public final EObject ruleVLSVariable() throws RecognitionException {

         EObject current = null;

 

@@ -6524,14 +6562,14 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:2496:2: ( ( (lv_name_0_0= RULE_UPPER_WORD_ID ) ) )

-            // InternalVampireLanguage.g:2497:2: ( (lv_name_0_0= RULE_UPPER_WORD_ID ) )

+            // InternalVampireLanguage.g:2518:2: ( ( (lv_name_0_0= RULE_UPPER_WORD_ID ) ) )

+            // InternalVampireLanguage.g:2519:2: ( (lv_name_0_0= RULE_UPPER_WORD_ID ) )

             {

-            // InternalVampireLanguage.g:2497:2: ( (lv_name_0_0= RULE_UPPER_WORD_ID ) )

-            // InternalVampireLanguage.g:2498:3: (lv_name_0_0= RULE_UPPER_WORD_ID )

+            // InternalVampireLanguage.g:2519:2: ( (lv_name_0_0= RULE_UPPER_WORD_ID ) )

+            // InternalVampireLanguage.g:2520:3: (lv_name_0_0= RULE_UPPER_WORD_ID )

             {

-            // InternalVampireLanguage.g:2498:3: (lv_name_0_0= RULE_UPPER_WORD_ID )

-            // InternalVampireLanguage.g:2499:4: lv_name_0_0= RULE_UPPER_WORD_ID

+            // InternalVampireLanguage.g:2520:3: (lv_name_0_0= RULE_UPPER_WORD_ID )

+            // InternalVampireLanguage.g:2521:4: lv_name_0_0= RULE_UPPER_WORD_ID

             {

             lv_name_0_0=(Token)match(input,RULE_UPPER_WORD_ID,FOLLOW_2); 

 

@@ -6573,7 +6611,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSFofTerm"

-    // InternalVampireLanguage.g:2518:1: entryRuleVLSFofTerm returns [EObject current=null] : iv_ruleVLSFofTerm= ruleVLSFofTerm EOF ;

+    // InternalVampireLanguage.g:2540:1: entryRuleVLSFofTerm returns [EObject current=null] : iv_ruleVLSFofTerm= ruleVLSFofTerm EOF ;

     public final EObject entryRuleVLSFofTerm() throws RecognitionException {

         EObject current = null;

 

@@ -6581,8 +6619,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:2518:51: (iv_ruleVLSFofTerm= ruleVLSFofTerm EOF )

-            // InternalVampireLanguage.g:2519:2: iv_ruleVLSFofTerm= ruleVLSFofTerm EOF

+            // InternalVampireLanguage.g:2540:51: (iv_ruleVLSFofTerm= ruleVLSFofTerm EOF )

+            // InternalVampireLanguage.g:2541:2: iv_ruleVLSFofTerm= ruleVLSFofTerm EOF

             {

              newCompositeNode(grammarAccess.getVLSFofTermRule()); 

             pushFollow(FOLLOW_1);

@@ -6609,7 +6647,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSFofTerm"

-    // InternalVampireLanguage.g:2525:1: ruleVLSFofTerm returns [EObject current=null] : (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) ;

+    // InternalVampireLanguage.g:2547:1: ruleVLSFofTerm returns [EObject current=null] : (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) ;

     public final EObject ruleVLSFofTerm() throws RecognitionException {

         EObject current = null;

 

@@ -6624,10 +6662,10 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:2531:2: ( (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) )

-            // InternalVampireLanguage.g:2532:2: (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm )

+            // InternalVampireLanguage.g:2553:2: ( (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm ) )

+            // InternalVampireLanguage.g:2554:2: (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm )

             {

-            // InternalVampireLanguage.g:2532:2: (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm )

+            // InternalVampireLanguage.g:2554:2: (this_VLSVariable_0= ruleVLSVariable | this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm | this_VLSDefinedTerm_2= ruleVLSDefinedTerm )

             int alt38=3;

             switch ( input.LA(1) ) {

             case RULE_UPPER_WORD_ID:

@@ -6658,7 +6696,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

             switch (alt38) {

                 case 1 :

-                    // InternalVampireLanguage.g:2533:3: this_VLSVariable_0= ruleVLSVariable

+                    // InternalVampireLanguage.g:2555:3: this_VLSVariable_0= ruleVLSVariable

                     {

 

                                         newCompositeNode(grammarAccess.getVLSFofTermAccess().getVLSVariableParserRuleCall_0());

@@ -6676,7 +6714,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:2542:3: this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm

+                    // InternalVampireLanguage.g:2564:3: this_VLSFunctionAsTerm_1= ruleVLSFunctionAsTerm

                     {

 

                                         newCompositeNode(grammarAccess.getVLSFofTermAccess().getVLSFunctionAsTermParserRuleCall_1());

@@ -6694,7 +6732,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 3 :

-                    // InternalVampireLanguage.g:2551:3: this_VLSDefinedTerm_2= ruleVLSDefinedTerm

+                    // InternalVampireLanguage.g:2573:3: this_VLSDefinedTerm_2= ruleVLSDefinedTerm

                     {

 

                                         newCompositeNode(grammarAccess.getVLSFofTermAccess().getVLSDefinedTermParserRuleCall_2());

@@ -6734,7 +6772,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSFunctionAsTerm"

-    // InternalVampireLanguage.g:2563:1: entryRuleVLSFunctionAsTerm returns [EObject current=null] : iv_ruleVLSFunctionAsTerm= ruleVLSFunctionAsTerm EOF ;

+    // InternalVampireLanguage.g:2585:1: entryRuleVLSFunctionAsTerm returns [EObject current=null] : iv_ruleVLSFunctionAsTerm= ruleVLSFunctionAsTerm EOF ;

     public final EObject entryRuleVLSFunctionAsTerm() throws RecognitionException {

         EObject current = null;

 

@@ -6742,8 +6780,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:2563:58: (iv_ruleVLSFunctionAsTerm= ruleVLSFunctionAsTerm EOF )

-            // InternalVampireLanguage.g:2564:2: iv_ruleVLSFunctionAsTerm= ruleVLSFunctionAsTerm EOF

+            // InternalVampireLanguage.g:2585:58: (iv_ruleVLSFunctionAsTerm= ruleVLSFunctionAsTerm EOF )

+            // InternalVampireLanguage.g:2586:2: iv_ruleVLSFunctionAsTerm= ruleVLSFunctionAsTerm EOF

             {

              newCompositeNode(grammarAccess.getVLSFunctionAsTermRule()); 

             pushFollow(FOLLOW_1);

@@ -6770,7 +6808,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSFunctionAsTerm"

-    // InternalVampireLanguage.g:2570:1: ruleVLSFunctionAsTerm returns [EObject current=null] : ( ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) ) (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )? ) ;

+    // InternalVampireLanguage.g:2592:1: ruleVLSFunctionAsTerm returns [EObject current=null] : ( ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) ) (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )? ) ;

     public final EObject ruleVLSFunctionAsTerm() throws RecognitionException {

         EObject current = null;

 

@@ -6790,19 +6828,19 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:2576:2: ( ( ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) ) (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )? ) )

-            // InternalVampireLanguage.g:2577:2: ( ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) ) (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )? )

+            // InternalVampireLanguage.g:2598:2: ( ( ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) ) (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )? ) )

+            // InternalVampireLanguage.g:2599:2: ( ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) ) (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )? )

             {

-            // InternalVampireLanguage.g:2577:2: ( ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) ) (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )? )

-            // InternalVampireLanguage.g:2578:3: ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) ) (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )?

+            // InternalVampireLanguage.g:2599:2: ( ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) ) (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )? )

+            // InternalVampireLanguage.g:2600:3: ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) ) (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )?

             {

-            // InternalVampireLanguage.g:2578:3: ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) )

-            // InternalVampireLanguage.g:2579:4: ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) )

+            // InternalVampireLanguage.g:2600:3: ( ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) ) )

+            // InternalVampireLanguage.g:2601:4: ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) )

             {

-            // InternalVampireLanguage.g:2579:4: ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) )

-            // InternalVampireLanguage.g:2580:5: (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID )

+            // InternalVampireLanguage.g:2601:4: ( (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID ) )

+            // InternalVampireLanguage.g:2602:5: (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID )

             {

-            // InternalVampireLanguage.g:2580:5: (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID )

+            // InternalVampireLanguage.g:2602:5: (lv_functor_0_1= RULE_LOWER_WORD_ID | lv_functor_0_2= RULE_SINGLE_QUOTE | lv_functor_0_3= RULE_DOLLAR_ID | lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID )

             int alt39=4;

             switch ( input.LA(1) ) {

             case RULE_LOWER_WORD_ID:

@@ -6834,7 +6872,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

             switch (alt39) {

                 case 1 :

-                    // InternalVampireLanguage.g:2581:6: lv_functor_0_1= RULE_LOWER_WORD_ID

+                    // InternalVampireLanguage.g:2603:6: lv_functor_0_1= RULE_LOWER_WORD_ID

                     {

                     lv_functor_0_1=(Token)match(input,RULE_LOWER_WORD_ID,FOLLOW_43); 

 

@@ -6854,7 +6892,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:2596:6: lv_functor_0_2= RULE_SINGLE_QUOTE

+                    // InternalVampireLanguage.g:2618:6: lv_functor_0_2= RULE_SINGLE_QUOTE

                     {

                     lv_functor_0_2=(Token)match(input,RULE_SINGLE_QUOTE,FOLLOW_43); 

 

@@ -6874,7 +6912,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 3 :

-                    // InternalVampireLanguage.g:2611:6: lv_functor_0_3= RULE_DOLLAR_ID

+                    // InternalVampireLanguage.g:2633:6: lv_functor_0_3= RULE_DOLLAR_ID

                     {

                     lv_functor_0_3=(Token)match(input,RULE_DOLLAR_ID,FOLLOW_43); 

 

@@ -6894,7 +6932,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 4 :

-                    // InternalVampireLanguage.g:2626:6: lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID

+                    // InternalVampireLanguage.g:2648:6: lv_functor_0_4= RULE_DOUBLE_DOLLAR_ID

                     {

                     lv_functor_0_4=(Token)match(input,RULE_DOUBLE_DOLLAR_ID,FOLLOW_43); 

 

@@ -6922,7 +6960,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

             }

 

-            // InternalVampireLanguage.g:2643:3: (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )?

+            // InternalVampireLanguage.g:2665:3: (otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')' )?

             int alt41=2;

             int LA41_0 = input.LA(1);

 

@@ -6931,17 +6969,17 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
             }

             switch (alt41) {

                 case 1 :

-                    // InternalVampireLanguage.g:2644:4: otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')'

+                    // InternalVampireLanguage.g:2666:4: otherlv_1= '(' ( (lv_terms_2_0= ruleVLSFofTerm ) ) (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )* otherlv_5= ')'

                     {

                     otherlv_1=(Token)match(input,38,FOLLOW_33); 

 

                                                 newLeafNode(otherlv_1, grammarAccess.getVLSFunctionAsTermAccess().getLeftParenthesisKeyword_1_0());

                                         

-                    // InternalVampireLanguage.g:2648:4: ( (lv_terms_2_0= ruleVLSFofTerm ) )

-                    // InternalVampireLanguage.g:2649:5: (lv_terms_2_0= ruleVLSFofTerm )

+                    // InternalVampireLanguage.g:2670:4: ( (lv_terms_2_0= ruleVLSFofTerm ) )

+                    // InternalVampireLanguage.g:2671:5: (lv_terms_2_0= ruleVLSFofTerm )

                     {

-                    // InternalVampireLanguage.g:2649:5: (lv_terms_2_0= ruleVLSFofTerm )

-                    // InternalVampireLanguage.g:2650:6: lv_terms_2_0= ruleVLSFofTerm

+                    // InternalVampireLanguage.g:2671:5: (lv_terms_2_0= ruleVLSFofTerm )

+                    // InternalVampireLanguage.g:2672:6: lv_terms_2_0= ruleVLSFofTerm

                     {

 

                                                                 newCompositeNode(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_1_0());

@@ -6968,7 +7006,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                     }

 

-                    // InternalVampireLanguage.g:2667:4: (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )*

+                    // InternalVampireLanguage.g:2689:4: (otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) ) )*

                     loop40:

                     do {

                         int alt40=2;

@@ -6981,17 +7019,17 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                         switch (alt40) {

                         case 1 :

-                            // InternalVampireLanguage.g:2668:5: otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) )

+                            // InternalVampireLanguage.g:2690:5: otherlv_3= ',' ( (lv_terms_4_0= ruleVLSFofTerm ) )

                             {

                             otherlv_3=(Token)match(input,39,FOLLOW_33); 

 

                                                                 newLeafNode(otherlv_3, grammarAccess.getVLSFunctionAsTermAccess().getCommaKeyword_1_2_0());

                                                         

-                            // InternalVampireLanguage.g:2672:5: ( (lv_terms_4_0= ruleVLSFofTerm ) )

-                            // InternalVampireLanguage.g:2673:6: (lv_terms_4_0= ruleVLSFofTerm )

+                            // InternalVampireLanguage.g:2694:5: ( (lv_terms_4_0= ruleVLSFofTerm ) )

+                            // InternalVampireLanguage.g:2695:6: (lv_terms_4_0= ruleVLSFofTerm )

                             {

-                            // InternalVampireLanguage.g:2673:6: (lv_terms_4_0= ruleVLSFofTerm )

-                            // InternalVampireLanguage.g:2674:7: lv_terms_4_0= ruleVLSFofTerm

+                            // InternalVampireLanguage.g:2695:6: (lv_terms_4_0= ruleVLSFofTerm )

+                            // InternalVampireLanguage.g:2696:7: lv_terms_4_0= ruleVLSFofTerm

                             {

 

                                                                                 newCompositeNode(grammarAccess.getVLSFunctionAsTermAccess().getTermsVLSFofTermParserRuleCall_1_2_1_0());

@@ -7060,7 +7098,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "entryRuleVLSDefinedTerm"

-    // InternalVampireLanguage.g:2701:1: entryRuleVLSDefinedTerm returns [EObject current=null] : iv_ruleVLSDefinedTerm= ruleVLSDefinedTerm EOF ;

+    // InternalVampireLanguage.g:2723:1: entryRuleVLSDefinedTerm returns [EObject current=null] : iv_ruleVLSDefinedTerm= ruleVLSDefinedTerm EOF ;

     public final EObject entryRuleVLSDefinedTerm() throws RecognitionException {

         EObject current = null;

 

@@ -7068,8 +7106,8 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

         try {

-            // InternalVampireLanguage.g:2701:55: (iv_ruleVLSDefinedTerm= ruleVLSDefinedTerm EOF )

-            // InternalVampireLanguage.g:2702:2: iv_ruleVLSDefinedTerm= ruleVLSDefinedTerm EOF

+            // InternalVampireLanguage.g:2723:55: (iv_ruleVLSDefinedTerm= ruleVLSDefinedTerm EOF )

+            // InternalVampireLanguage.g:2724:2: iv_ruleVLSDefinedTerm= ruleVLSDefinedTerm EOF

             {

              newCompositeNode(grammarAccess.getVLSDefinedTermRule()); 

             pushFollow(FOLLOW_1);

@@ -7096,7 +7134,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

 

     // $ANTLR start "ruleVLSDefinedTerm"

-    // InternalVampireLanguage.g:2708:1: ruleVLSDefinedTerm returns [EObject current=null] : ( ( () ( (lv_value_1_0= RULE_SIGNED_LITERAL ) ) ) | ( () ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) ) ) ) ;

+    // InternalVampireLanguage.g:2730:1: ruleVLSDefinedTerm returns [EObject current=null] : ( ( () ( (lv_value_1_0= RULE_SIGNED_LITERAL ) ) ) | ( () ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) ) ) ) ;

     public final EObject ruleVLSDefinedTerm() throws RecognitionException {

         EObject current = null;

 

@@ -7107,10 +7145,10 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                 enterRule();

 

         try {

-            // InternalVampireLanguage.g:2714:2: ( ( ( () ( (lv_value_1_0= RULE_SIGNED_LITERAL ) ) ) | ( () ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) ) ) ) )

-            // InternalVampireLanguage.g:2715:2: ( ( () ( (lv_value_1_0= RULE_SIGNED_LITERAL ) ) ) | ( () ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) ) ) )

+            // InternalVampireLanguage.g:2736:2: ( ( ( () ( (lv_value_1_0= RULE_SIGNED_LITERAL ) ) ) | ( () ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) ) ) ) )

+            // InternalVampireLanguage.g:2737:2: ( ( () ( (lv_value_1_0= RULE_SIGNED_LITERAL ) ) ) | ( () ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) ) ) )

             {

-            // InternalVampireLanguage.g:2715:2: ( ( () ( (lv_value_1_0= RULE_SIGNED_LITERAL ) ) ) | ( () ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) ) ) )

+            // InternalVampireLanguage.g:2737:2: ( ( () ( (lv_value_1_0= RULE_SIGNED_LITERAL ) ) ) | ( () ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) ) ) )

             int alt42=2;

             int LA42_0 = input.LA(1);

 

@@ -7128,13 +7166,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
             }

             switch (alt42) {

                 case 1 :

-                    // InternalVampireLanguage.g:2716:3: ( () ( (lv_value_1_0= RULE_SIGNED_LITERAL ) ) )

+                    // InternalVampireLanguage.g:2738:3: ( () ( (lv_value_1_0= RULE_SIGNED_LITERAL ) ) )

                     {

-                    // InternalVampireLanguage.g:2716:3: ( () ( (lv_value_1_0= RULE_SIGNED_LITERAL ) ) )

-                    // InternalVampireLanguage.g:2717:4: () ( (lv_value_1_0= RULE_SIGNED_LITERAL ) )

+                    // InternalVampireLanguage.g:2738:3: ( () ( (lv_value_1_0= RULE_SIGNED_LITERAL ) ) )

+                    // InternalVampireLanguage.g:2739:4: () ( (lv_value_1_0= RULE_SIGNED_LITERAL ) )

                     {

-                    // InternalVampireLanguage.g:2717:4: ()

-                    // InternalVampireLanguage.g:2718:5: 

+                    // InternalVampireLanguage.g:2739:4: ()

+                    // InternalVampireLanguage.g:2740:5: 

                     {

 

                                                         current = forceCreateModelElement(

@@ -7144,11 +7182,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                     }

 

-                    // InternalVampireLanguage.g:2724:4: ( (lv_value_1_0= RULE_SIGNED_LITERAL ) )

-                    // InternalVampireLanguage.g:2725:5: (lv_value_1_0= RULE_SIGNED_LITERAL )

+                    // InternalVampireLanguage.g:2746:4: ( (lv_value_1_0= RULE_SIGNED_LITERAL ) )

+                    // InternalVampireLanguage.g:2747:5: (lv_value_1_0= RULE_SIGNED_LITERAL )

                     {

-                    // InternalVampireLanguage.g:2725:5: (lv_value_1_0= RULE_SIGNED_LITERAL )

-                    // InternalVampireLanguage.g:2726:6: lv_value_1_0= RULE_SIGNED_LITERAL

+                    // InternalVampireLanguage.g:2747:5: (lv_value_1_0= RULE_SIGNED_LITERAL )

+                    // InternalVampireLanguage.g:2748:6: lv_value_1_0= RULE_SIGNED_LITERAL

                     {

                     lv_value_1_0=(Token)match(input,RULE_SIGNED_LITERAL,FOLLOW_2); 

 

@@ -7177,13 +7215,13 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
                     }

                     break;

                 case 2 :

-                    // InternalVampireLanguage.g:2744:3: ( () ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) ) )

+                    // InternalVampireLanguage.g:2766:3: ( () ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) ) )

                     {

-                    // InternalVampireLanguage.g:2744:3: ( () ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) ) )

-                    // InternalVampireLanguage.g:2745:4: () ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) )

+                    // InternalVampireLanguage.g:2766:3: ( () ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) ) )

+                    // InternalVampireLanguage.g:2767:4: () ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) )

                     {

-                    // InternalVampireLanguage.g:2745:4: ()

-                    // InternalVampireLanguage.g:2746:5: 

+                    // InternalVampireLanguage.g:2767:4: ()

+                    // InternalVampireLanguage.g:2768:5: 

                     {

 

                                                         current = forceCreateModelElement(

@@ -7193,11 +7231,11 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
 

                     }

 

-                    // InternalVampireLanguage.g:2752:4: ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) )

-                    // InternalVampireLanguage.g:2753:5: (lv_value_3_0= RULE_DOUBLE_QUOTE )

+                    // InternalVampireLanguage.g:2774:4: ( (lv_value_3_0= RULE_DOUBLE_QUOTE ) )

+                    // InternalVampireLanguage.g:2775:5: (lv_value_3_0= RULE_DOUBLE_QUOTE )

                     {

-                    // InternalVampireLanguage.g:2753:5: (lv_value_3_0= RULE_DOUBLE_QUOTE )

-                    // InternalVampireLanguage.g:2754:6: lv_value_3_0= RULE_DOUBLE_QUOTE

+                    // InternalVampireLanguage.g:2775:5: (lv_value_3_0= RULE_DOUBLE_QUOTE )

+                    // InternalVampireLanguage.g:2776:6: lv_value_3_0= RULE_DOUBLE_QUOTE

                     {

                     lv_value_3_0=(Token)match(input,RULE_DOUBLE_QUOTE,FOLLOW_2); 

 

@@ -7365,7 +7403,7 @@ public class InternalVampireLanguageParser extends AbstractInternalAntlrParser {
             this.transition = dfa_14;

         }

         public String getDescription() {

-            return "2069:2: (this_VLSAtomicConstant_0= ruleVLSAtomicConstant | this_VLSAtomicFunction_1= ruleVLSAtomicFunction | this_VLSVariable_2= ruleVLSVariable | this_VLSDefinedTerm_3= ruleVLSDefinedTerm )";

+            return "2091:2: (this_VLSAtomicConstant_0= ruleVLSAtomicConstant | this_VLSAtomicFunction_1= ruleVLSAtomicFunction | this_VLSVariable_2= ruleVLSVariable | this_VLSDefinedTerm_3= ruleVLSDefinedTerm )";

         }

     }

  

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSemanticSequencer.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSemanticSequencer.java
index 29a17f23..67be7b9a 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSemanticSequencer.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSemanticSequencer.java
@@ -25,6 +25,7 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSLess;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSNand;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSNor;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOtherDeclaration;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSRevImplies;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSSatisfiable;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula;

@@ -34,6 +35,7 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSWarning;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSXnor;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;

@@ -84,36 +86,8 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
                                 sequence_VLSComment(context, (VLSComment) semanticObject); 

                                 return; 

                         case VampireLanguagePackage.VLS_CONSTANT:

-                                if (rule == grammarAccess.getVLSTermRule()

-                                                || rule == grammarAccess.getVLSBinaryRule()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSEquivalentLeftAction_1_0_0_0_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSImpliesLeftAction_1_0_0_1_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSRevImpliesLeftAction_1_0_0_2_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSXnorLeftAction_1_0_0_3_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSNorLeftAction_1_0_0_4_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSNandLeftAction_1_0_0_5_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSAndLeftAction_1_1_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSOrLeftAction_1_2_0()

-                                                || rule == grammarAccess.getVLSUnitaryFormulaRule()

-                                                || rule == grammarAccess.getVLSUnaryInfixRule()

-                                                || action == grammarAccess.getVLSUnaryInfixAccess().getVLSInequalityLeftAction_1_0_0_0()

-                                                || action == grammarAccess.getVLSUnaryInfixAccess().getVLSEqualityLeftAction_1_0_1_0()

-                                                || action == grammarAccess.getVLSUnaryInfixAccess().getVLSAssignmentLeftAction_1_0_2_0()

-                                                || rule == grammarAccess.getVLSAtomicRule()

-                                                || rule == grammarAccess.getVLSAtomicConstantRule()) {

-                                        sequence_VLSAtomicConstant(context, (VLSConstant) semanticObject); 

-                                        return; 

-                                }

-                                else if (rule == grammarAccess.getVLSTffTermRule()) {

-                                        sequence_VLSAtomicConstant_VLSOtherDeclaration(context, (VLSConstant) semanticObject); 

-                                        return; 

-                                }

-                                else if (rule == grammarAccess.getVLSDeclarationRule()

-                                                || rule == grammarAccess.getVLSOtherDeclarationRule()) {

-                                        sequence_VLSAtomicConstant_VLSOtherDeclaration(context, (VLSConstant) semanticObject); 

-                                        return; 

-                                }

-                                else break;

+                                sequence_VLSAtomicConstant(context, (VLSConstant) semanticObject); 

+                                return; 

                         case VampireLanguagePackage.VLS_DOUBLE_QUOTE:

                                 sequence_VLSDefinedTerm(context, (VLSDoubleQuote) semanticObject); 

                                 return; 

@@ -127,36 +101,8 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
                                 sequence_VLSExistentialQuantifier(context, (VLSExistentialQuantifier) semanticObject); 

                                 return; 

                         case VampireLanguagePackage.VLS_FALSE:

-                                if (rule == grammarAccess.getVLSTermRule()

-                                                || rule == grammarAccess.getVLSBinaryRule()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSEquivalentLeftAction_1_0_0_0_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSImpliesLeftAction_1_0_0_1_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSRevImpliesLeftAction_1_0_0_2_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSXnorLeftAction_1_0_0_3_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSNorLeftAction_1_0_0_4_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSNandLeftAction_1_0_0_5_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSAndLeftAction_1_1_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSOrLeftAction_1_2_0()

-                                                || rule == grammarAccess.getVLSUnitaryFormulaRule()

-                                                || rule == grammarAccess.getVLSUnaryInfixRule()

-                                                || action == grammarAccess.getVLSUnaryInfixAccess().getVLSInequalityLeftAction_1_0_0_0()

-                                                || action == grammarAccess.getVLSUnaryInfixAccess().getVLSEqualityLeftAction_1_0_1_0()

-                                                || action == grammarAccess.getVLSUnaryInfixAccess().getVLSAssignmentLeftAction_1_0_2_0()

-                                                || rule == grammarAccess.getVLSAtomicRule()

-                                                || rule == grammarAccess.getVLSAtomicConstantRule()) {

-                                        sequence_VLSAtomicConstant(context, (VLSFalse) semanticObject); 

-                                        return; 

-                                }

-                                else if (rule == grammarAccess.getVLSTffTermRule()) {

-                                        sequence_VLSAtomicConstant_VLSOtherDeclaration(context, (VLSFalse) semanticObject); 

-                                        return; 

-                                }

-                                else if (rule == grammarAccess.getVLSDeclarationRule()

-                                                || rule == grammarAccess.getVLSOtherDeclarationRule()) {

-                                        sequence_VLSAtomicConstant_VLSOtherDeclaration(context, (VLSFalse) semanticObject); 

-                                        return; 

-                                }

-                                else break;

+                                sequence_VLSAtomicConstant(context, (VLSFalse) semanticObject); 

+                                return; 

                         case VampireLanguagePackage.VLS_FINITE_MODEL:

                                 sequence_VLSConfirmations(context, (VLSFiniteModel) semanticObject); 

                                 return; 

@@ -190,6 +136,9 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
                         case VampireLanguagePackage.VLS_OR:

                                 sequence_VLSBinary(context, (VLSOr) semanticObject); 

                                 return; 

+                        case VampireLanguagePackage.VLS_OTHER_DECLARATION:

+                                sequence_VLSOtherDeclaration(context, (VLSOtherDeclaration) semanticObject); 

+                                return; 

                         case VampireLanguagePackage.VLS_REV_IMPLIES:

                                 sequence_VLSBinary(context, (VLSRevImplies) semanticObject); 

                                 return; 

@@ -200,36 +149,8 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
                                 sequence_VLSTffFormula(context, (VLSTffFormula) semanticObject); 

                                 return; 

                         case VampireLanguagePackage.VLS_TRUE:

-                                if (rule == grammarAccess.getVLSTffTermRule()) {

-                                        sequence_VLSAtomicConstant_VLSOtherDeclaration(context, (VLSTrue) semanticObject); 

-                                        return; 

-                                }

-                                else if (rule == grammarAccess.getVLSDeclarationRule()

-                                                || rule == grammarAccess.getVLSOtherDeclarationRule()) {

-                                        sequence_VLSAtomicConstant_VLSOtherDeclaration(context, (VLSTrue) semanticObject); 

-                                        return; 

-                                }

-                                else if (rule == grammarAccess.getVLSTermRule()

-                                                || rule == grammarAccess.getVLSBinaryRule()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSEquivalentLeftAction_1_0_0_0_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSImpliesLeftAction_1_0_0_1_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSRevImpliesLeftAction_1_0_0_2_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSXnorLeftAction_1_0_0_3_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSNorLeftAction_1_0_0_4_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSNandLeftAction_1_0_0_5_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSAndLeftAction_1_1_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSOrLeftAction_1_2_0()

-                                                || rule == grammarAccess.getVLSUnitaryFormulaRule()

-                                                || rule == grammarAccess.getVLSUnaryInfixRule()

-                                                || action == grammarAccess.getVLSUnaryInfixAccess().getVLSInequalityLeftAction_1_0_0_0()

-                                                || action == grammarAccess.getVLSUnaryInfixAccess().getVLSEqualityLeftAction_1_0_1_0()

-                                                || action == grammarAccess.getVLSUnaryInfixAccess().getVLSAssignmentLeftAction_1_0_2_0()

-                                                || rule == grammarAccess.getVLSAtomicRule()

-                                                || rule == grammarAccess.getVLSAtomicConstantRule()) {

-                                        sequence_VLSAtomicConstant(context, (VLSTrue) semanticObject); 

-                                        return; 

-                                }

-                                else break;

+                                sequence_VLSAtomicConstant(context, (VLSTrue) semanticObject); 

+                                return; 

                         case VampireLanguagePackage.VLS_TRYING:

                                 sequence_VLSConfirmations(context, (VLSTrying) semanticObject); 

                                 return; 

@@ -250,37 +171,11 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
                                 sequence_VLSUniversalQuantifier(context, (VLSUniversalQuantifier) semanticObject); 

                                 return; 

                         case VampireLanguagePackage.VLS_VARIABLE:

-                                if (rule == grammarAccess.getVLSTermRule()

-                                                || rule == grammarAccess.getVLSBinaryRule()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSEquivalentLeftAction_1_0_0_0_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSImpliesLeftAction_1_0_0_1_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSRevImpliesLeftAction_1_0_0_2_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSXnorLeftAction_1_0_0_3_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSNorLeftAction_1_0_0_4_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSNandLeftAction_1_0_0_5_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSAndLeftAction_1_1_0()

-                                                || action == grammarAccess.getVLSBinaryAccess().getVLSOrLeftAction_1_2_0()

-                                                || rule == grammarAccess.getVLSUnitaryFormulaRule()

-                                                || rule == grammarAccess.getVLSUnaryInfixRule()

-                                                || action == grammarAccess.getVLSUnaryInfixAccess().getVLSInequalityLeftAction_1_0_0_0()

-                                                || action == grammarAccess.getVLSUnaryInfixAccess().getVLSEqualityLeftAction_1_0_1_0()

-                                                || action == grammarAccess.getVLSUnaryInfixAccess().getVLSAssignmentLeftAction_1_0_2_0()

-                                                || rule == grammarAccess.getVLSAtomicRule()

-                                                || rule == grammarAccess.getVLSVariableRule()

-                                                || rule == grammarAccess.getVLSFofTermRule()) {

-                                        sequence_VLSVariable(context, (VLSVariable) semanticObject); 

-                                        return; 

-                                }

-                                else if (rule == grammarAccess.getVLSTffTermRule()) {

-                                        sequence_VLSVariable_VLSVariableDeclaration(context, (VLSVariable) semanticObject); 

-                                        return; 

-                                }

-                                else if (rule == grammarAccess.getVLSDeclarationRule()

-                                                || rule == grammarAccess.getVLSVariableDeclarationRule()) {

-                                        sequence_VLSVariable_VLSVariableDeclaration(context, (VLSVariable) semanticObject); 

-                                        return; 

-                                }

-                                else break;

+                                sequence_VLSVariable(context, (VLSVariable) semanticObject); 

+                                return; 

+                        case VampireLanguagePackage.VLS_VARIABLE_DECLARATION:

+                                sequence_VLSVariableDeclaration(context, (VLSVariableDeclaration) semanticObject); 

+                                return; 

                         case VampireLanguagePackage.VLS_WARNING:

                                 sequence_VLSConfirmations(context, (VLSWarning) semanticObject); 

                                 return; 

@@ -321,6 +216,7 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
         

         /**

          * Contexts:

+         *     VLSTffTerm returns VLSConstant

          *     VLSTerm returns VLSConstant

          *     VLSBinary returns VLSConstant

          *     VLSBinary.VLSEquivalent_1_0_0_0_0 returns VLSConstant

@@ -349,6 +245,7 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
         

         /**

          * Contexts:

+         *     VLSTffTerm returns VLSFalse

          *     VLSTerm returns VLSFalse

          *     VLSBinary returns VLSFalse

          *     VLSBinary.VLSEquivalent_1_0_0_0_0 returns VLSFalse

@@ -377,81 +274,7 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
         

         /**

          * Contexts:

-         *     VLSTffTerm returns VLSConstant

-         *

-         * Constraint:

-         *     ((name=LOWER_WORD_ID | name=SINGLE_QUOTE | name=DOLLAR_ID | name=DOUBLE_DOLLAR_ID | name=VLSRole) type=VLSTypeDef?)

-         */

-        protected void sequence_VLSAtomicConstant_VLSOtherDeclaration(ISerializationContext context, VLSConstant semanticObject) {

-                genericSequencer.createSequence(context, semanticObject);

-        }

-        

-        

-        // This method is commented out because it has the same signature as another method in this class.

-        // This is probably a bug in Xtext's serializer, please report it here: 

-        // https://bugs.eclipse.org/bugs/enter_bug.cgi?product=TMF

-        //

-        // Contexts:

-        //     VLSDeclaration returns VLSConstant

-        //     VLSOtherDeclaration returns VLSConstant

-        //

-        // Constraint:

-        //     ((name=LOWER_WORD_ID | name=SINGLE_QUOTE | name=DOLLAR_ID | name=DOUBLE_DOLLAR_ID | name=VLSRole) type=VLSTypeDef)

-        //

-        // protected void sequence_VLSAtomicConstant_VLSOtherDeclaration(ISerializationContext context, VLSConstant semanticObject) { }

-        

-        /**

-         * Contexts:

-         *     VLSTffTerm returns VLSFalse

-         *

-         * Constraint:

-         *     type=VLSTypeDef?

-         */

-        protected void sequence_VLSAtomicConstant_VLSOtherDeclaration(ISerializationContext context, VLSFalse semanticObject) {

-                genericSequencer.createSequence(context, semanticObject);

-        }

-        

-        

-        // This method is commented out because it has the same signature as another method in this class.

-        // This is probably a bug in Xtext's serializer, please report it here: 

-        // https://bugs.eclipse.org/bugs/enter_bug.cgi?product=TMF

-        //

-        // Contexts:

-        //     VLSDeclaration returns VLSFalse

-        //     VLSOtherDeclaration returns VLSFalse

-        //

-        // Constraint:

-        //     type=VLSTypeDef

-        //

-        // protected void sequence_VLSAtomicConstant_VLSOtherDeclaration(ISerializationContext context, VLSFalse semanticObject) { }

-        

-        /**

-         * Contexts:

          *     VLSTffTerm returns VLSTrue

-         *

-         * Constraint:

-         *     type=VLSTypeDef?

-         */

-        protected void sequence_VLSAtomicConstant_VLSOtherDeclaration(ISerializationContext context, VLSTrue semanticObject) {

-                genericSequencer.createSequence(context, semanticObject);

-        }

-        

-        

-        // This method is commented out because it has the same signature as another method in this class.

-        // This is probably a bug in Xtext's serializer, please report it here: 

-        // https://bugs.eclipse.org/bugs/enter_bug.cgi?product=TMF

-        //

-        // Contexts:

-        //     VLSDeclaration returns VLSTrue

-        //     VLSOtherDeclaration returns VLSTrue

-        //

-        // Constraint:

-        //     type=VLSTypeDef

-        //

-        // protected void sequence_VLSAtomicConstant_VLSOtherDeclaration(ISerializationContext context, VLSTrue semanticObject) { }

-        

-        /**

-         * Contexts:

          *     VLSTerm returns VLSTrue

          *     VLSBinary returns VLSTrue

          *     VLSBinary.VLSEquivalent_1_0_0_0_0 returns VLSTrue

@@ -959,8 +782,8 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
          * Constraint:

          *     (

          *         (variables+=VLSVariable | variables+=VLSVariableDeclaration) 

-         *         variables+=VLSVariable? 

-         *         (variables+=VLSVariableDeclaration? variables+=VLSVariable?)* 

+         *         variables+=VLSVariableDeclaration? 

+         *         (variables+=VLSVariable? variables+=VLSVariableDeclaration?)* 

          *         operand=VLSUnitaryFormula

          *     )

          */

@@ -996,6 +819,29 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
         

         /**

          * Contexts:

+         *     VLSTffTerm returns VLSOtherDeclaration

+         *     VLSDeclaration returns VLSOtherDeclaration

+         *     VLSOtherDeclaration returns VLSOtherDeclaration

+         *

+         * Constraint:

+         *     (name=VLSAtomicConstant type=VLSTypeDef)

+         */

+        protected void sequence_VLSOtherDeclaration(ISerializationContext context, VLSOtherDeclaration semanticObject) {

+                if (errorAcceptor != null) {

+                        if (transientValues.isValueTransient(semanticObject, VampireLanguagePackage.Literals.VLS_OTHER_DECLARATION__NAME) == ValueTransient.YES)

+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, VampireLanguagePackage.Literals.VLS_OTHER_DECLARATION__NAME));

+                        if (transientValues.isValueTransient(semanticObject, VampireLanguagePackage.Literals.VLS_DECLARATION__TYPE) == ValueTransient.YES)

+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, VampireLanguagePackage.Literals.VLS_DECLARATION__TYPE));

+                }

+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);

+                feeder.accept(grammarAccess.getVLSOtherDeclarationAccess().getNameVLSAtomicConstantParserRuleCall_0_0(), semanticObject.getName());

+                feeder.accept(grammarAccess.getVLSOtherDeclarationAccess().getTypeVLSTypeDefParserRuleCall_2_0(), semanticObject.getType());

+                feeder.finish();

+        }

+        

+        

+        /**

+         * Contexts:

          *     VLSTffFormula returns VLSTffFormula

          *

          * Constraint:

@@ -1178,8 +1024,8 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
          * Constraint:

          *     (

          *         (variables+=VLSVariable | variables+=VLSVariableDeclaration) 

-         *         variables+=VLSVariableDeclaration? 

-         *         (variables+=VLSVariable? variables+=VLSVariableDeclaration?)* 

+         *         variables+=VLSVariable? 

+         *         (variables+=VLSVariableDeclaration? variables+=VLSVariable?)* 

          *         operand=VLSUnitaryFormula

          *     )

          */

@@ -1190,6 +1036,30 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
         

         /**

          * Contexts:

+         *     VLSTffTerm returns VLSVariableDeclaration

+         *     VLSDeclaration returns VLSVariableDeclaration

+         *     VLSVariableDeclaration returns VLSVariableDeclaration

+         *

+         * Constraint:

+         *     (name=VLSVariable type=VLSTypeDef)

+         */

+        protected void sequence_VLSVariableDeclaration(ISerializationContext context, VLSVariableDeclaration semanticObject) {

+                if (errorAcceptor != null) {

+                        if (transientValues.isValueTransient(semanticObject, VampireLanguagePackage.Literals.VLS_VARIABLE_DECLARATION__NAME) == ValueTransient.YES)

+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, VampireLanguagePackage.Literals.VLS_VARIABLE_DECLARATION__NAME));

+                        if (transientValues.isValueTransient(semanticObject, VampireLanguagePackage.Literals.VLS_DECLARATION__TYPE) == ValueTransient.YES)

+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, VampireLanguagePackage.Literals.VLS_DECLARATION__TYPE));

+                }

+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);

+                feeder.accept(grammarAccess.getVLSVariableDeclarationAccess().getNameVLSVariableParserRuleCall_0_0(), semanticObject.getName());

+                feeder.accept(grammarAccess.getVLSVariableDeclarationAccess().getTypeVLSTypeDefParserRuleCall_2_0(), semanticObject.getType());

+                feeder.finish();

+        }

+        

+        

+        /**

+         * Contexts:

+         *     VLSTffTerm returns VLSVariable

          *     VLSTerm returns VLSVariable

          *     VLSBinary returns VLSVariable

          *     VLSBinary.VLSEquivalent_1_0_0_0_0 returns VLSVariable

@@ -1225,31 +1095,6 @@ public class VampireLanguageSemanticSequencer extends AbstractDelegatingSemantic
         

         /**

          * Contexts:

-         *     VLSTffTerm returns VLSVariable

-         *

-         * Constraint:

-         *     (name=UPPER_WORD_ID type=VLSTypeDef?)

-         */

-        protected void sequence_VLSVariable_VLSVariableDeclaration(ISerializationContext context, VLSVariable semanticObject) {

-                genericSequencer.createSequence(context, semanticObject);

-        }

-        

-        

-        // This method is commented out because it has the same signature as another method in this class.

-        // This is probably a bug in Xtext's serializer, please report it here: 

-        // https://bugs.eclipse.org/bugs/enter_bug.cgi?product=TMF

-        //

-        // Contexts:

-        //     VLSDeclaration returns VLSVariable

-        //     VLSVariableDeclaration returns VLSVariable

-        //

-        // Constraint:

-        //     (name=UPPER_WORD_ID type=VLSTypeDef)

-        //

-        // protected void sequence_VLSVariable_VLSVariableDeclaration(ISerializationContext context, VLSVariable semanticObject) { }

-        

-        /**

-         * Contexts:

          *     VampireModel returns VampireModel

          *

          * Constraint:

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSyntacticSequencer.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSyntacticSequencer.java
index d3c1b221..6f66f66b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSyntacticSequencer.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/serializer/VampireLanguageSyntacticSequencer.java
@@ -95,9 +95,7 @@ public class VampireLanguageSyntacticSequencer extends AbstractSyntacticSequence
          * This ambiguous syntax occurs at:

          *     (rule start) (ambiguity) '!' '[' variables+=VLSVariable

          *     (rule start) (ambiguity) '!' '[' variables+=VLSVariableDeclaration

-         *     (rule start) (ambiguity) '$false' ':' type=VLSTypeDef

          *     (rule start) (ambiguity) '$false' (rule start)

-         *     (rule start) (ambiguity) '$true' ':' type=VLSTypeDef

          *     (rule start) (ambiguity) '$true' (rule start)

          *     (rule start) (ambiguity) '?' '[' variables+=VLSVariable

          *     (rule start) (ambiguity) '?' '[' variables+=VLSVariableDeclaration

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/services/VampireLanguageGrammarAccess.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/services/VampireLanguageGrammarAccess.java
index 5538f472..c84261e9 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/services/VampireLanguageGrammarAccess.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/services/VampireLanguageGrammarAccess.java
@@ -741,20 +741,24 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder {
         public class VLSOtherDeclarationElements extends AbstractParserRuleElementFinder {

                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ca.mcgill.ecse.dslreasoner.VampireLanguage.VLSOtherDeclaration");

                 private final Group cGroup = (Group)rule.eContents().get(1);

-                private final RuleCall cVLSAtomicConstantParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);

+                private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);

+                private final RuleCall cNameVLSAtomicConstantParserRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);

                 private final Keyword cColonKeyword_1 = (Keyword)cGroup.eContents().get(1);

                 private final Assignment cTypeAssignment_2 = (Assignment)cGroup.eContents().get(2);

                 private final RuleCall cTypeVLSTypeDefParserRuleCall_2_0 = (RuleCall)cTypeAssignment_2.eContents().get(0);

                 

                 //VLSOtherDeclaration:

-                //      VLSAtomicConstant ':' type=VLSTypeDef;

+                //      name=VLSAtomicConstant ':' type=VLSTypeDef;

                 @Override public ParserRule getRule() { return rule; }

                 

-                //VLSAtomicConstant ':' type=VLSTypeDef

+                //name=VLSAtomicConstant ':' type=VLSTypeDef

                 public Group getGroup() { return cGroup; }

                 

+                //name=VLSAtomicConstant

+                public Assignment getNameAssignment_0() { return cNameAssignment_0; }

+                

                 //VLSAtomicConstant

-                public RuleCall getVLSAtomicConstantParserRuleCall_0() { return cVLSAtomicConstantParserRuleCall_0; }

+                public RuleCall getNameVLSAtomicConstantParserRuleCall_0_0() { return cNameVLSAtomicConstantParserRuleCall_0_0; }

                 

                 //':'

                 public Keyword getColonKeyword_1() { return cColonKeyword_1; }

@@ -768,20 +772,24 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder {
         public class VLSVariableDeclarationElements extends AbstractParserRuleElementFinder {

                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "ca.mcgill.ecse.dslreasoner.VampireLanguage.VLSVariableDeclaration");

                 private final Group cGroup = (Group)rule.eContents().get(1);

-                private final RuleCall cVLSVariableParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);

+                private final Assignment cNameAssignment_0 = (Assignment)cGroup.eContents().get(0);

+                private final RuleCall cNameVLSVariableParserRuleCall_0_0 = (RuleCall)cNameAssignment_0.eContents().get(0);

                 private final Keyword cColonKeyword_1 = (Keyword)cGroup.eContents().get(1);

                 private final Assignment cTypeAssignment_2 = (Assignment)cGroup.eContents().get(2);

                 private final RuleCall cTypeVLSTypeDefParserRuleCall_2_0 = (RuleCall)cTypeAssignment_2.eContents().get(0);

                 

                 //VLSVariableDeclaration:

-                //      VLSVariable ':' type=VLSTypeDef;

+                //      name=VLSVariable ':' type=VLSTypeDef;

                 @Override public ParserRule getRule() { return rule; }

                 

-                //VLSVariable ':' type=VLSTypeDef

+                //name=VLSVariable ':' type=VLSTypeDef

                 public Group getGroup() { return cGroup; }

                 

+                //name=VLSVariable

+                public Assignment getNameAssignment_0() { return cNameAssignment_0; }

+                

                 //VLSVariable

-                public RuleCall getVLSVariableParserRuleCall_0() { return cVLSVariableParserRuleCall_0; }

+                public RuleCall getNameVLSVariableParserRuleCall_0_0() { return cNameVLSVariableParserRuleCall_0_0; }

                 

                 //':'

                 public Keyword getColonKeyword_1() { return cColonKeyword_1; }

@@ -2196,7 +2204,7 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder {
         }

         

         //VLSOtherDeclaration:

-        //      VLSAtomicConstant ':' type=VLSTypeDef;

+        //      name=VLSAtomicConstant ':' type=VLSTypeDef;

         public VLSOtherDeclarationElements getVLSOtherDeclarationAccess() {

                 return pVLSOtherDeclaration;

         }

@@ -2206,7 +2214,7 @@ public class VampireLanguageGrammarAccess extends AbstractGrammarElementFinder {
         }

         

         //VLSVariableDeclaration:

-        //      VLSVariable ':' type=VLSTypeDef;

+        //      name=VLSVariable ':' type=VLSTypeDef;

         public VLSVariableDeclarationElements getVLSVariableDeclarationAccess() {

                 return pVLSVariableDeclaration;

         }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDeclaration.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDeclaration.java
index d3e5a2d5..4ff74235 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDeclaration.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSDeclaration.java
@@ -9,6 +9,12 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage;
  * A representation of the model object '<em><b>VLS Declaration</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDeclaration#getType <em>Type</em>}</li>
+ * </ul>
  *
  * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSDeclaration()
  * @model
@@ -16,4 +22,30 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage;
  */
 public interface VLSDeclaration extends VLSTffTerm
 {
+  /**
+   * Returns the value of the '<em><b>Type</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Type</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Type</em>' containment reference.
+   * @see #setType(VLSTypeDef)
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSDeclaration_Type()
+   * @model containment="true"
+   * @generated
+   */
+  VLSTypeDef getType();
+
+  /**
+   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDeclaration#getType <em>Type</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Type</em>' containment reference.
+   * @see #getType()
+   * @generated
+   */
+  void setType(VLSTypeDef value);
+
 } // VLSDeclaration
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java
index a70dff64..c70d312b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSExistentialQuantifier.java
@@ -26,7 +26,7 @@ public interface VLSExistentialQuantifier extends VLSTerm
 {

   /**

    * Returns the value of the '<em><b>Variables</b></em>' containment reference list.

-   * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration}.

+   * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffTerm}.

    * <!-- begin-user-doc -->

    * <p>

    * If the meaning of the '<em>Variables</em>' containment reference list isn't clear,

@@ -38,7 +38,7 @@ public interface VLSExistentialQuantifier extends VLSTerm
    * @model containment="true"

    * @generated

    */

-  EList<VLSVariableDeclaration> getVariables();

+  EList<VLSTffTerm> getVariables();

 

   /**

    * Returns the value of the '<em><b>Operand</b></em>' containment reference.

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOtherDeclaration.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOtherDeclaration.java
index 0ffd104d..4e4e3d8b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOtherDeclaration.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSOtherDeclaration.java
@@ -9,6 +9,12 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage;
  * A representation of the model object '<em><b>VLS Other Declaration</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOtherDeclaration#getName <em>Name</em>}</li>
+ * </ul>
  *
  * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSOtherDeclaration()
  * @model
@@ -16,4 +22,30 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage;
  */
 public interface VLSOtherDeclaration extends VLSDeclaration
 {
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Name</em>' containment reference.
+   * @see #setName(VLSTerm)
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSOtherDeclaration_Name()
+   * @model containment="true"
+   * @generated
+   */
+  VLSTerm getName();
+
+  /**
+   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOtherDeclaration#getName <em>Name</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Name</em>' containment reference.
+   * @see #getName()
+   * @generated
+   */
+  void setName(VLSTerm value);
+
 } // VLSOtherDeclaration
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java
index 7a077714..d1f20508 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSTerm.java
@@ -9,43 +9,11 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage;
  * A representation of the model object '<em><b>VLS Term</b></em>'.

  * <!-- end-user-doc -->

  *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm#getType <em>Type</em>}</li>

- * </ul>

  *

  * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTerm()

  * @model

  * @generated

  */

-public interface VLSTerm extends VLSTffTerm, VLSOtherDeclaration

+public interface VLSTerm extends VLSTffTerm

 {

-  /**

-   * Returns the value of the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <p>

-   * If the meaning of the '<em>Type</em>' containment reference isn't clear,

-   * there really should be more of a description here...

-   * </p>

-   * <!-- end-user-doc -->

-   * @return the value of the '<em>Type</em>' containment reference.

-   * @see #setType(VLSTypeDef)

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSTerm_Type()

-   * @model containment="true"

-   * @generated

-   */

-  VLSTypeDef getType();

-

-  /**

-   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm#getType <em>Type</em>}' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @param value the new value of the '<em>Type</em>' containment reference.

-   * @see #getType()

-   * @generated

-   */

-  void setType(VLSTypeDef value);

-

 } // VLSTerm

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java
index 00dd1733..9e7da58a 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSUniversalQuantifier.java
@@ -26,7 +26,7 @@ public interface VLSUniversalQuantifier extends VLSTerm
 {

   /**

    * Returns the value of the '<em><b>Variables</b></em>' containment reference list.

-   * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration}.

+   * The list contents are of type {@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffTerm}.

    * <!-- begin-user-doc -->

    * <p>

    * If the meaning of the '<em>Variables</em>' containment reference list isn't clear,

@@ -38,7 +38,7 @@ public interface VLSUniversalQuantifier extends VLSTerm
    * @model containment="true"

    * @generated

    */

-  EList<VLSVariableDeclaration> getVariables();

+  EList<VLSTffTerm> getVariables();

 

   /**

    * Returns the value of the '<em><b>Operand</b></em>' containment reference.

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java
index 5a9dc028..9750e4c5 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariable.java
@@ -20,7 +20,7 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage;
  * @model

  * @generated

  */

-public interface VLSVariable extends VLSVariableDeclaration, VLSTerm

+public interface VLSVariable extends VLSTerm

 {

   /**

    * Returns the value of the '<em><b>Name</b></em>' attribute.

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariableDeclaration.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariableDeclaration.java
index 9e5a6ba2..a45aec5c 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariableDeclaration.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VLSVariableDeclaration.java
@@ -9,6 +9,12 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage;
  * A representation of the model object '<em><b>VLS Variable Declaration</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration#getName <em>Name</em>}</li>
+ * </ul>
  *
  * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSVariableDeclaration()
  * @model
@@ -16,4 +22,30 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage;
  */
 public interface VLSVariableDeclaration extends VLSDeclaration
 {
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Name</em>' containment reference.
+   * @see #setName(VLSVariable)
+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage#getVLSVariableDeclaration_Name()
+   * @model containment="true"
+   * @generated
+   */
+  VLSVariable getName();
+
+  /**
+   * Sets the value of the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration#getName <em>Name</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Name</em>' containment reference.
+   * @see #getName()
+   * @generated
+   */
+  void setName(VLSVariable value);
+
 } // VLSVariableDeclaration
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java
index 3ef777f8..7c917251 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/VampireLanguagePackage.java
@@ -345,13 +345,22 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_DECLARATION = 7;

 

   /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   * @ordered

+   */

+  int VLS_DECLARATION__TYPE = VLS_TFF_TERM_FEATURE_COUNT + 0;

+

+  /**

    * The number of structural features of the '<em>VLS Declaration</em>' class.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

    * @generated

    * @ordered

    */

-  int VLS_DECLARATION_FEATURE_COUNT = VLS_TFF_TERM_FEATURE_COUNT + 0;

+  int VLS_DECLARATION_FEATURE_COUNT = VLS_TFF_TERM_FEATURE_COUNT + 1;

 

   /**

    * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSOtherDeclarationImpl <em>VLS Other Declaration</em>}' class.

@@ -364,13 +373,31 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_OTHER_DECLARATION = 8;

 

   /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   * @ordered

+   */

+  int VLS_OTHER_DECLARATION__TYPE = VLS_DECLARATION__TYPE;

+

+  /**

+   * The feature id for the '<em><b>Name</b></em>' containment reference.

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   * @ordered

+   */

+  int VLS_OTHER_DECLARATION__NAME = VLS_DECLARATION_FEATURE_COUNT + 0;

+

+  /**

    * The number of structural features of the '<em>VLS Other Declaration</em>' class.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

    * @generated

    * @ordered

    */

-  int VLS_OTHER_DECLARATION_FEATURE_COUNT = VLS_DECLARATION_FEATURE_COUNT + 0;

+  int VLS_OTHER_DECLARATION_FEATURE_COUNT = VLS_DECLARATION_FEATURE_COUNT + 1;

 

   /**

    * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableDeclarationImpl <em>VLS Variable Declaration</em>}' class.

@@ -383,13 +410,31 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_VARIABLE_DECLARATION = 9;

 

   /**

+   * The feature id for the '<em><b>Type</b></em>' containment reference.

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   * @ordered

+   */

+  int VLS_VARIABLE_DECLARATION__TYPE = VLS_DECLARATION__TYPE;

+

+  /**

+   * The feature id for the '<em><b>Name</b></em>' containment reference.

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   * @ordered

+   */

+  int VLS_VARIABLE_DECLARATION__NAME = VLS_DECLARATION_FEATURE_COUNT + 0;

+

+  /**

    * The number of structural features of the '<em>VLS Variable Declaration</em>' class.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

    * @generated

    * @ordered

    */

-  int VLS_VARIABLE_DECLARATION_FEATURE_COUNT = VLS_DECLARATION_FEATURE_COUNT + 0;

+  int VLS_VARIABLE_DECLARATION_FEATURE_COUNT = VLS_DECLARATION_FEATURE_COUNT + 1;

 

   /**

    * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTypeDefImpl <em>VLS Type Def</em>}' class.

@@ -457,22 +502,13 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_TERM = 11;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_TERM__TYPE = VLS_TFF_TERM_FEATURE_COUNT + 0;

-

-  /**

    * The number of structural features of the '<em>VLS Term</em>' class.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

    * @generated

    * @ordered

    */

-  int VLS_TERM_FEATURE_COUNT = VLS_TFF_TERM_FEATURE_COUNT + 1;

+  int VLS_TERM_FEATURE_COUNT = VLS_TFF_TERM_FEATURE_COUNT + 0;

 

   /**

    * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableImpl <em>VLS Variable</em>}' class.

@@ -485,22 +521,13 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_VARIABLE = 12;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_VARIABLE__TYPE = VLS_VARIABLE_DECLARATION_FEATURE_COUNT + 0;

-

-  /**

    * The feature id for the '<em><b>Name</b></em>' attribute.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

    * @generated

    * @ordered

    */

-  int VLS_VARIABLE__NAME = VLS_VARIABLE_DECLARATION_FEATURE_COUNT + 1;

+  int VLS_VARIABLE__NAME = VLS_TERM_FEATURE_COUNT + 0;

 

   /**

    * The number of structural features of the '<em>VLS Variable</em>' class.

@@ -509,7 +536,7 @@ public interface VampireLanguagePackage extends EPackage
    * @generated

    * @ordered

    */

-  int VLS_VARIABLE_FEATURE_COUNT = VLS_VARIABLE_DECLARATION_FEATURE_COUNT + 2;

+  int VLS_VARIABLE_FEATURE_COUNT = VLS_TERM_FEATURE_COUNT + 1;

 

   /**

    * The meta object id for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSFunctionAsTermImpl <em>VLS Function As Term</em>}' class.

@@ -522,15 +549,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_FUNCTION_AS_TERM = 13;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_FUNCTION_AS_TERM__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Functor</b></em>' attribute.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -568,15 +586,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_DEFINED_TERM = 14;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_DEFINED_TERM__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Value</b></em>' attribute.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -690,15 +699,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_EQUIVALENT = 19;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_EQUIVALENT__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -736,15 +736,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_IMPLIES = 20;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_IMPLIES__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -782,15 +773,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_REV_IMPLIES = 21;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_REV_IMPLIES__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -828,15 +810,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_XNOR = 22;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_XNOR__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -874,15 +847,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_NOR = 23;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_NOR__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -920,15 +884,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_NAND = 24;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_NAND__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -966,15 +921,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_AND = 25;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_AND__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1012,15 +958,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_OR = 26;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_OR__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1058,15 +995,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_UNIVERSAL_QUANTIFIER = 27;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_UNIVERSAL_QUANTIFIER__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Variables</b></em>' containment reference list.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1104,15 +1032,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_EXISTENTIAL_QUANTIFIER = 28;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_EXISTENTIAL_QUANTIFIER__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Variables</b></em>' containment reference list.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1150,15 +1069,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_UNARY_NEGATION = 29;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_UNARY_NEGATION__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Operand</b></em>' containment reference.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1187,15 +1097,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_INEQUALITY = 30;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_INEQUALITY__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1233,15 +1134,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_EQUALITY = 31;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_EQUALITY__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1279,15 +1171,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_ASSIGNMENT = 32;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_ASSIGNMENT__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Left</b></em>' containment reference.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1325,15 +1208,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_CONSTANT = 33;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_CONSTANT__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Name</b></em>' attribute.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1362,15 +1236,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_TRUE = 34;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_TRUE__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The number of structural features of the '<em>VLS True</em>' class.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1390,15 +1255,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_FALSE = 35;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_FALSE__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The number of structural features of the '<em>VLS False</em>' class.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1418,15 +1274,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_FUNCTION = 36;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_FUNCTION__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Constant</b></em>' attribute.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1464,15 +1311,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_LESS = 37;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_LESS__TYPE = VLS_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Name</b></em>' attribute.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1510,15 +1348,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_INT = 38;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_INT__TYPE = VLS_DEFINED_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Value</b></em>' attribute.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1547,15 +1376,6 @@ public interface VampireLanguagePackage extends EPackage
   int VLS_DOUBLE_QUOTE = 39;

 

   /**

-   * The feature id for the '<em><b>Type</b></em>' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   * @ordered

-   */

-  int VLS_DOUBLE_QUOTE__TYPE = VLS_DEFINED_TERM__TYPE;

-

-  /**

    * The feature id for the '<em><b>Value</b></em>' attribute.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1831,6 +1651,17 @@ public interface VampireLanguagePackage extends EPackage
   EClass getVLSDeclaration();

 

   /**

+   * Returns the meta object for the containment reference '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDeclaration#getType <em>Type</em>}'.

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @return the meta object for the containment reference '<em>Type</em>'.

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDeclaration#getType()

+   * @see #getVLSDeclaration()

+   * @generated

+   */

+  EReference getVLSDeclaration_Type();

+

+  /**

    * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOtherDeclaration <em>VLS Other Declaration</em>}'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1841,6 +1672,17 @@ public interface VampireLanguagePackage extends EPackage
   EClass getVLSOtherDeclaration();

 

   /**

+   * Returns the meta object for the containment reference '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOtherDeclaration#getName <em>Name</em>}'.

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @return the meta object for the containment reference '<em>Name</em>'.

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOtherDeclaration#getName()

+   * @see #getVLSOtherDeclaration()

+   * @generated

+   */

+  EReference getVLSOtherDeclaration_Name();

+

+  /**

    * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration <em>VLS Variable Declaration</em>}'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1851,6 +1693,17 @@ public interface VampireLanguagePackage extends EPackage
   EClass getVLSVariableDeclaration();

 

   /**

+   * Returns the meta object for the containment reference '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration#getName <em>Name</em>}'.

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @return the meta object for the containment reference '<em>Name</em>'.

+   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration#getName()

+   * @see #getVLSVariableDeclaration()

+   * @generated

+   */

+  EReference getVLSVariableDeclaration_Name();

+

+  /**

    * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef <em>VLS Type Def</em>}'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -1915,17 +1768,6 @@ public interface VampireLanguagePackage extends EPackage
   EClass getVLSTerm();

 

   /**

-   * Returns the meta object for the containment reference '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm#getType <em>Type</em>}'.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @return the meta object for the containment reference '<em>Type</em>'.

-   * @see ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm#getType()

-   * @see #getVLSTerm()

-   * @generated

-   */

-  EReference getVLSTerm_Type();

-

-  /**

    * Returns the meta object for class '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable <em>VLS Variable</em>}'.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -2844,6 +2686,14 @@ public interface VampireLanguagePackage extends EPackage
     EClass VLS_DECLARATION = eINSTANCE.getVLSDeclaration();

 

     /**

+     * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.

+     * <!-- begin-user-doc -->

+     * <!-- end-user-doc -->

+     * @generated

+     */

+    EReference VLS_DECLARATION__TYPE = eINSTANCE.getVLSDeclaration_Type();

+

+    /**

      * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSOtherDeclarationImpl <em>VLS Other Declaration</em>}' class.

      * <!-- begin-user-doc -->

      * <!-- end-user-doc -->

@@ -2854,6 +2704,14 @@ public interface VampireLanguagePackage extends EPackage
     EClass VLS_OTHER_DECLARATION = eINSTANCE.getVLSOtherDeclaration();

 

     /**

+     * The meta object literal for the '<em><b>Name</b></em>' containment reference feature.

+     * <!-- begin-user-doc -->

+     * <!-- end-user-doc -->

+     * @generated

+     */

+    EReference VLS_OTHER_DECLARATION__NAME = eINSTANCE.getVLSOtherDeclaration_Name();

+

+    /**

      * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableDeclarationImpl <em>VLS Variable Declaration</em>}' class.

      * <!-- begin-user-doc -->

      * <!-- end-user-doc -->

@@ -2864,6 +2722,14 @@ public interface VampireLanguagePackage extends EPackage
     EClass VLS_VARIABLE_DECLARATION = eINSTANCE.getVLSVariableDeclaration();

 

     /**

+     * The meta object literal for the '<em><b>Name</b></em>' containment reference feature.

+     * <!-- begin-user-doc -->

+     * <!-- end-user-doc -->

+     * @generated

+     */

+    EReference VLS_VARIABLE_DECLARATION__NAME = eINSTANCE.getVLSVariableDeclaration_Name();

+

+    /**

      * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTypeDefImpl <em>VLS Type Def</em>}' class.

      * <!-- begin-user-doc -->

      * <!-- end-user-doc -->

@@ -2916,14 +2782,6 @@ public interface VampireLanguagePackage extends EPackage
     EClass VLS_TERM = eINSTANCE.getVLSTerm();

 

     /**

-     * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.

-     * <!-- begin-user-doc -->

-     * <!-- end-user-doc -->

-     * @generated

-     */

-    EReference VLS_TERM__TYPE = eINSTANCE.getVLSTerm_Type();

-

-    /**

      * The meta object literal for the '{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableImpl <em>VLS Variable</em>}' class.

      * <!-- begin-user-doc -->

      * <!-- end-user-doc -->

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDeclarationImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDeclarationImpl.java
index bb913d80..894c76de 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDeclarationImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSDeclarationImpl.java
@@ -4,20 +4,43 @@
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
 
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSDeclaration;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTypeDef;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;
 
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>VLS Declaration</b></em>'.
  * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSDeclarationImpl#getType <em>Type</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class VLSDeclarationImpl extends VLSTffTermImpl implements VLSDeclaration
 {
   /**
+   * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getType()
+   * @generated
+   * @ordered
+   */
+  protected VLSTypeDef type;
+
+  /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
@@ -38,4 +61,134 @@ public class VLSDeclarationImpl extends VLSTffTermImpl implements VLSDeclaration
     return VampireLanguagePackage.Literals.VLS_DECLARATION;
   }
 
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public VLSTypeDef getType()
+  {
+    return type;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetType(VLSTypeDef newType, NotificationChain msgs)
+  {
+    VLSTypeDef oldType = type;
+    type = newType;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_DECLARATION__TYPE, oldType, newType);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setType(VLSTypeDef newType)
+  {
+    if (newType != type)
+    {
+      NotificationChain msgs = null;
+      if (type != null)
+        msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_DECLARATION__TYPE, null, msgs);
+      if (newType != null)
+        msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_DECLARATION__TYPE, null, msgs);
+      msgs = basicSetType(newType, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_DECLARATION__TYPE, newType, newType));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_DECLARATION__TYPE:
+        return basicSetType(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_DECLARATION__TYPE:
+        return getType();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_DECLARATION__TYPE:
+        setType((VLSTypeDef)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_DECLARATION__TYPE:
+        setType((VLSTypeDef)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_DECLARATION__TYPE:
+        return type != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
 } //VLSDeclarationImpl
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java
index 115c7a23..6d71ec60 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSExistentialQuantifierImpl.java
@@ -5,7 +5,7 @@ package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
 

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;

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

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffTerm;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;

 

 import java.util.Collection;

@@ -47,7 +47,7 @@ public class VLSExistentialQuantifierImpl extends VLSTermImpl implements VLSExis
    * @generated

    * @ordered

    */

-  protected EList<VLSVariableDeclaration> variables;

+  protected EList<VLSTffTerm> variables;

 

   /**

    * The cached value of the '{@link #getOperand() <em>Operand</em>}' containment reference.

@@ -85,11 +85,11 @@ public class VLSExistentialQuantifierImpl extends VLSTermImpl implements VLSExis
    * <!-- end-user-doc -->

    * @generated

    */

-  public EList<VLSVariableDeclaration> getVariables()

+  public EList<VLSTffTerm> getVariables()

   {

     if (variables == null)

     {

-      variables = new EObjectContainmentEList<VLSVariableDeclaration>(VLSVariableDeclaration.class, this, VampireLanguagePackage.VLS_EXISTENTIAL_QUANTIFIER__VARIABLES);

+      variables = new EObjectContainmentEList<VLSTffTerm>(VLSTffTerm.class, this, VampireLanguagePackage.VLS_EXISTENTIAL_QUANTIFIER__VARIABLES);

     }

     return variables;

   }

@@ -191,7 +191,7 @@ public class VLSExistentialQuantifierImpl extends VLSTermImpl implements VLSExis
     {

       case VampireLanguagePackage.VLS_EXISTENTIAL_QUANTIFIER__VARIABLES:

         getVariables().clear();

-        getVariables().addAll((Collection<? extends VLSVariableDeclaration>)newValue);

+        getVariables().addAll((Collection<? extends VLSTffTerm>)newValue);

         return;

       case VampireLanguagePackage.VLS_EXISTENTIAL_QUANTIFIER__OPERAND:

         setOperand((VLSTerm)newValue);

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOtherDeclarationImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOtherDeclarationImpl.java
index c5abc76a..eb7afd3d 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOtherDeclarationImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSOtherDeclarationImpl.java
@@ -4,20 +4,43 @@
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
 
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOtherDeclaration;
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;
 
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>VLS Other Declaration</b></em>'.
  * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSOtherDeclarationImpl#getName <em>Name</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class VLSOtherDeclarationImpl extends VLSDeclarationImpl implements VLSOtherDeclaration
 {
   /**
+   * The cached value of the '{@link #getName() <em>Name</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected VLSTerm name;
+
+  /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
@@ -38,4 +61,134 @@ public class VLSOtherDeclarationImpl extends VLSDeclarationImpl implements VLSOt
     return VampireLanguagePackage.Literals.VLS_OTHER_DECLARATION;
   }
 
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public VLSTerm getName()
+  {
+    return name;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetName(VLSTerm newName, NotificationChain msgs)
+  {
+    VLSTerm oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME, oldName, newName);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setName(VLSTerm newName)
+  {
+    if (newName != name)
+    {
+      NotificationChain msgs = null;
+      if (name != null)
+        msgs = ((InternalEObject)name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME, null, msgs);
+      if (newName != null)
+        msgs = ((InternalEObject)newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME, null, msgs);
+      msgs = basicSetName(newName, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME, newName, newName));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME:
+        return basicSetName(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME:
+        return getName();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME:
+        setName((VLSTerm)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME:
+        setName((VLSTerm)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_OTHER_DECLARATION__NAME:
+        return name != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
 } //VLSOtherDeclarationImpl
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java
index 0ea49b4c..c56d7ecd 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSTermImpl.java
@@ -4,43 +4,20 @@
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;

 

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;

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

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;

 

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-

 import org.eclipse.emf.ecore.EClass;

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

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

 

 /**

  * <!-- begin-user-doc -->

  * An implementation of the model object '<em><b>VLS Term</b></em>'.

  * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * </p>

- * <ul>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSTermImpl#getType <em>Type</em>}</li>

- * </ul>

  *

  * @generated

  */

 public class VLSTermImpl extends VLSTffTermImpl implements VLSTerm

 {

   /**

-   * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @see #getType()

-   * @generated

-   * @ordered

-   */

-  protected VLSTypeDef type;

-

-  /**

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

    * @generated

@@ -61,134 +38,4 @@ public class VLSTermImpl extends VLSTffTermImpl implements VLSTerm
     return VampireLanguagePackage.Literals.VLS_TERM;

   }

 

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  public VLSTypeDef getType()

-  {

-    return type;

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  public NotificationChain basicSetType(VLSTypeDef newType, NotificationChain msgs)

-  {

-    VLSTypeDef oldType = type;

-    type = newType;

-    if (eNotificationRequired())

-    {

-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TERM__TYPE, oldType, newType);

-      if (msgs == null) msgs = notification; else msgs.add(notification);

-    }

-    return msgs;

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  public void setType(VLSTypeDef newType)

-  {

-    if (newType != type)

-    {

-      NotificationChain msgs = null;

-      if (type != null)

-        msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_TERM__TYPE, null, msgs);

-      if (newType != null)

-        msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_TERM__TYPE, null, msgs);

-      msgs = basicSetType(newType, msgs);

-      if (msgs != null) msgs.dispatch();

-    }

-    else if (eNotificationRequired())

-      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_TERM__TYPE, newType, newType));

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_TERM__TYPE:

-        return basicSetType(null, msgs);

-    }

-    return super.eInverseRemove(otherEnd, featureID, msgs);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public Object eGet(int featureID, boolean resolve, boolean coreType)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_TERM__TYPE:

-        return getType();

-    }

-    return super.eGet(featureID, resolve, coreType);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public void eSet(int featureID, Object newValue)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_TERM__TYPE:

-        setType((VLSTypeDef)newValue);

-        return;

-    }

-    super.eSet(featureID, newValue);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public void eUnset(int featureID)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_TERM__TYPE:

-        setType((VLSTypeDef)null);

-        return;

-    }

-    super.eUnset(featureID);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public boolean eIsSet(int featureID)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_TERM__TYPE:

-        return type != null;

-    }

-    return super.eIsSet(featureID);

-  }

-

 } //VLSTermImpl

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java
index b9bfbe07..e3482fb8 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSUniversalQuantifierImpl.java
@@ -4,8 +4,8 @@
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;

 

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffTerm;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier;

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

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;

 

 import java.util.Collection;

@@ -47,7 +47,7 @@ public class VLSUniversalQuantifierImpl extends VLSTermImpl implements VLSUniver
    * @generated

    * @ordered

    */

-  protected EList<VLSVariableDeclaration> variables;

+  protected EList<VLSTffTerm> variables;

 

   /**

    * The cached value of the '{@link #getOperand() <em>Operand</em>}' containment reference.

@@ -85,11 +85,11 @@ public class VLSUniversalQuantifierImpl extends VLSTermImpl implements VLSUniver
    * <!-- end-user-doc -->

    * @generated

    */

-  public EList<VLSVariableDeclaration> getVariables()

+  public EList<VLSTffTerm> getVariables()

   {

     if (variables == null)

     {

-      variables = new EObjectContainmentEList<VLSVariableDeclaration>(VLSVariableDeclaration.class, this, VampireLanguagePackage.VLS_UNIVERSAL_QUANTIFIER__VARIABLES);

+      variables = new EObjectContainmentEList<VLSTffTerm>(VLSTffTerm.class, this, VampireLanguagePackage.VLS_UNIVERSAL_QUANTIFIER__VARIABLES);

     }

     return variables;

   }

@@ -191,7 +191,7 @@ public class VLSUniversalQuantifierImpl extends VLSTermImpl implements VLSUniver
     {

       case VampireLanguagePackage.VLS_UNIVERSAL_QUANTIFIER__VARIABLES:

         getVariables().clear();

-        getVariables().addAll((Collection<? extends VLSVariableDeclaration>)newValue);

+        getVariables().addAll((Collection<? extends VLSTffTerm>)newValue);

         return;

       case VampireLanguagePackage.VLS_UNIVERSAL_QUANTIFIER__OPERAND:

         setOperand((VLSTerm)newValue);

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableDeclarationImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableDeclarationImpl.java
index 0e6c0ef9..5ebb84c7 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableDeclarationImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableDeclarationImpl.java
@@ -3,21 +3,44 @@
  */
 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;
 
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariableDeclaration;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;
 
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>VLS Variable Declaration</b></em>'.
  * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableDeclarationImpl#getName <em>Name</em>}</li>
+ * </ul>
  *
  * @generated
  */
 public class VLSVariableDeclarationImpl extends VLSDeclarationImpl implements VLSVariableDeclaration
 {
   /**
+   * The cached value of the '{@link #getName() <em>Name</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected VLSVariable name;
+
+  /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
@@ -38,4 +61,134 @@ public class VLSVariableDeclarationImpl extends VLSDeclarationImpl implements VL
     return VampireLanguagePackage.Literals.VLS_VARIABLE_DECLARATION;
   }
 
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public VLSVariable getName()
+  {
+    return name;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetName(VLSVariable newName, NotificationChain msgs)
+  {
+    VLSVariable oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME, oldName, newName);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setName(VLSVariable newName)
+  {
+    if (newName != name)
+    {
+      NotificationChain msgs = null;
+      if (name != null)
+        msgs = ((InternalEObject)name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME, null, msgs);
+      if (newName != null)
+        msgs = ((InternalEObject)newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME, null, msgs);
+      msgs = basicSetName(newName, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME, newName, newName));
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME:
+        return basicSetName(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME:
+        return getName();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME:
+        setName((VLSVariable)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME:
+        setName((VLSVariable)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case VampireLanguagePackage.VLS_VARIABLE_DECLARATION__NAME:
+        return name != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
 } //VLSVariableDeclarationImpl
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java
index 1d38ddfb..9ebed3eb 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VLSVariableImpl.java
@@ -3,17 +3,12 @@
  */

 package ca.mcgill.ecse.dslreasoner.vampireLanguage.impl;

 

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

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

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

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguagePackage;

 

 import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

 

 import org.eclipse.emf.ecore.EClass;

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

 

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 

@@ -25,25 +20,14 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * The following features are implemented:

  * </p>

  * <ul>

- *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableImpl#getType <em>Type</em>}</li>

  *   <li>{@link ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSVariableImpl#getName <em>Name</em>}</li>

  * </ul>

  *

  * @generated

  */

-public class VLSVariableImpl extends VLSVariableDeclarationImpl implements VLSVariable

+public class VLSVariableImpl extends VLSTermImpl implements VLSVariable

 {

   /**

-   * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @see #getType()

-   * @generated

-   * @ordered

-   */

-  protected VLSTypeDef type;

-

-  /**

    * The default value of the '{@link #getName() <em>Name</em>}' attribute.

    * <!-- begin-user-doc -->

    * <!-- end-user-doc -->

@@ -89,54 +73,6 @@ public class VLSVariableImpl extends VLSVariableDeclarationImpl implements VLSVa
    * <!-- end-user-doc -->

    * @generated

    */

-  public VLSTypeDef getType()

-  {

-    return type;

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  public NotificationChain basicSetType(VLSTypeDef newType, NotificationChain msgs)

-  {

-    VLSTypeDef oldType = type;

-    type = newType;

-    if (eNotificationRequired())

-    {

-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_VARIABLE__TYPE, oldType, newType);

-      if (msgs == null) msgs = notification; else msgs.add(notification);

-    }

-    return msgs;

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  public void setType(VLSTypeDef newType)

-  {

-    if (newType != type)

-    {

-      NotificationChain msgs = null;

-      if (type != null)

-        msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_VARIABLE__TYPE, null, msgs);

-      if (newType != null)

-        msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - VampireLanguagePackage.VLS_VARIABLE__TYPE, null, msgs);

-      msgs = basicSetType(newType, msgs);

-      if (msgs != null) msgs.dispatch();

-    }

-    else if (eNotificationRequired())

-      eNotify(new ENotificationImpl(this, Notification.SET, VampireLanguagePackage.VLS_VARIABLE__TYPE, newType, newType));

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

   public String getName()

   {

     return name;

@@ -161,28 +97,10 @@ public class VLSVariableImpl extends VLSVariableDeclarationImpl implements VLSVa
    * @generated

    */

   @Override

-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

-  {

-    switch (featureID)

-    {

-      case VampireLanguagePackage.VLS_VARIABLE__TYPE:

-        return basicSetType(null, msgs);

-    }

-    return super.eInverseRemove(otherEnd, featureID, msgs);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

   public Object eGet(int featureID, boolean resolve, boolean coreType)

   {

     switch (featureID)

     {

-      case VampireLanguagePackage.VLS_VARIABLE__TYPE:

-        return getType();

       case VampireLanguagePackage.VLS_VARIABLE__NAME:

         return getName();

     }

@@ -199,9 +117,6 @@ public class VLSVariableImpl extends VLSVariableDeclarationImpl implements VLSVa
   {

     switch (featureID)

     {

-      case VampireLanguagePackage.VLS_VARIABLE__TYPE:

-        setType((VLSTypeDef)newValue);

-        return;

       case VampireLanguagePackage.VLS_VARIABLE__NAME:

         setName((String)newValue);

         return;

@@ -219,9 +134,6 @@ public class VLSVariableImpl extends VLSVariableDeclarationImpl implements VLSVa
   {

     switch (featureID)

     {

-      case VampireLanguagePackage.VLS_VARIABLE__TYPE:

-        setType((VLSTypeDef)null);

-        return;

       case VampireLanguagePackage.VLS_VARIABLE__NAME:

         setName(NAME_EDEFAULT);

         return;

@@ -239,8 +151,6 @@ public class VLSVariableImpl extends VLSVariableDeclarationImpl implements VLSVa
   {

     switch (featureID)

     {

-      case VampireLanguagePackage.VLS_VARIABLE__TYPE:

-        return type != null;

       case VampireLanguagePackage.VLS_VARIABLE__NAME:

         return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

     }

@@ -253,58 +163,6 @@ public class VLSVariableImpl extends VLSVariableDeclarationImpl implements VLSVa
    * @generated

    */

   @Override

-  public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)

-  {

-    if (baseClass == VLSOtherDeclaration.class)

-    {

-      switch (derivedFeatureID)

-      {

-        default: return -1;

-      }

-    }

-    if (baseClass == VLSTerm.class)

-    {

-      switch (derivedFeatureID)

-      {

-        case VampireLanguagePackage.VLS_VARIABLE__TYPE: return VampireLanguagePackage.VLS_TERM__TYPE;

-        default: return -1;

-      }

-    }

-    return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

-  public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)

-  {

-    if (baseClass == VLSOtherDeclaration.class)

-    {

-      switch (baseFeatureID)

-      {

-        default: return -1;

-      }

-    }

-    if (baseClass == VLSTerm.class)

-    {

-      switch (baseFeatureID)

-      {

-        case VampireLanguagePackage.VLS_TERM__TYPE: return VampireLanguagePackage.VLS_VARIABLE__TYPE;

-        default: return -1;

-      }

-    }

-    return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

-  @Override

   public String toString()

   {

     if (eIsProxy()) return super.toString();

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java
index 6b2b7085..676b2786 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/impl/VampireLanguagePackageImpl.java
@@ -649,6 +649,16 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

+  public EReference getVLSDeclaration_Type()

+  {

+    return (EReference)vlsDeclarationEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

   public EClass getVLSOtherDeclaration()

   {

     return vlsOtherDeclarationEClass;

@@ -659,6 +669,16 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

+  public EReference getVLSOtherDeclaration_Name()

+  {

+    return (EReference)vlsOtherDeclarationEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

   public EClass getVLSVariableDeclaration()

   {

     return vlsVariableDeclarationEClass;

@@ -669,6 +689,16 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

+  public EReference getVLSVariableDeclaration_Name()

+  {

+    return (EReference)vlsVariableDeclarationEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * @generated

+   */

   public EClass getVLSTypeDef()

   {

     return vlsTypeDefEClass;

@@ -729,16 +759,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
    * <!-- end-user-doc -->

    * @generated

    */

-  public EReference getVLSTerm_Type()

-  {

-    return (EReference)vlsTermEClass.getEStructuralFeatures().get(0);

-  }

-

-  /**

-   * <!-- begin-user-doc -->

-   * <!-- end-user-doc -->

-   * @generated

-   */

   public EClass getVLSVariable()

   {

     return vlsVariableEClass;

@@ -1445,10 +1465,13 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     vlsTffTermEClass = createEClass(VLS_TFF_TERM);

 

     vlsDeclarationEClass = createEClass(VLS_DECLARATION);

+    createEReference(vlsDeclarationEClass, VLS_DECLARATION__TYPE);

 

     vlsOtherDeclarationEClass = createEClass(VLS_OTHER_DECLARATION);

+    createEReference(vlsOtherDeclarationEClass, VLS_OTHER_DECLARATION__NAME);

 

     vlsVariableDeclarationEClass = createEClass(VLS_VARIABLE_DECLARATION);

+    createEReference(vlsVariableDeclarationEClass, VLS_VARIABLE_DECLARATION__NAME);

 

     vlsTypeDefEClass = createEClass(VLS_TYPE_DEF);

     createEReference(vlsTypeDefEClass, VLS_TYPE_DEF__TYPE_SIG);

@@ -1457,7 +1480,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     createEReference(vlsTypeDefEClass, VLS_TYPE_DEF__NEXT_TYPE);

 

     vlsTermEClass = createEClass(VLS_TERM);

-    createEReference(vlsTermEClass, VLS_TERM__TYPE);

 

     vlsVariableEClass = createEClass(VLS_VARIABLE);

     createEAttribute(vlsVariableEClass, VLS_VARIABLE__NAME);

@@ -1586,8 +1608,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     vlsOtherDeclarationEClass.getESuperTypes().add(this.getVLSDeclaration());

     vlsVariableDeclarationEClass.getESuperTypes().add(this.getVLSDeclaration());

     vlsTermEClass.getESuperTypes().add(this.getVLSTffTerm());

-    vlsTermEClass.getESuperTypes().add(this.getVLSOtherDeclaration());

-    vlsVariableEClass.getESuperTypes().add(this.getVLSVariableDeclaration());

     vlsVariableEClass.getESuperTypes().add(this.getVLSTerm());

     vlsFunctionAsTermEClass.getESuperTypes().add(this.getVLSTerm());

     vlsDefinedTermEClass.getESuperTypes().add(this.getVLSTerm());

@@ -1649,10 +1669,13 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     initEClass(vlsTffTermEClass, VLSTffTerm.class, "VLSTffTerm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

 

     initEClass(vlsDeclarationEClass, VLSDeclaration.class, "VLSDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getVLSDeclaration_Type(), this.getVLSTypeDef(), null, "type", null, 0, 1, VLSDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsOtherDeclarationEClass, VLSOtherDeclaration.class, "VLSOtherDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getVLSOtherDeclaration_Name(), this.getVLSTerm(), null, "name", null, 0, 1, VLSOtherDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsVariableDeclarationEClass, VLSVariableDeclaration.class, "VLSVariableDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getVLSVariableDeclaration_Name(), this.getVLSVariable(), null, "name", null, 0, 1, VLSVariableDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsTypeDefEClass, VLSTypeDef.class, "VLSTypeDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEReference(getVLSTypeDef_TypeSig(), this.getVLSTypeDef(), null, "typeSig", null, 0, 1, VLSTypeDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

@@ -1661,7 +1684,6 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     initEReference(getVLSTypeDef_NextType(), this.getVLSTerm(), null, "nextType", null, 0, 1, VLSTypeDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsTermEClass, VLSTerm.class, "VLSTerm", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-    initEReference(getVLSTerm_Type(), this.getVLSTypeDef(), null, "type", null, 0, 1, VLSTerm.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsVariableEClass, VLSVariable.class, "VLSVariable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

     initEAttribute(getVLSVariable_Name(), ecorePackage.getEString(), "name", null, 0, 1, VLSVariable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

@@ -1715,11 +1737,11 @@ public class VampireLanguagePackageImpl extends EPackageImpl implements VampireL
     initEReference(getVLSOr_Right(), this.getVLSTerm(), null, "right", null, 0, 1, VLSOr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsUniversalQuantifierEClass, VLSUniversalQuantifier.class, "VLSUniversalQuantifier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-    initEReference(getVLSUniversalQuantifier_Variables(), this.getVLSVariableDeclaration(), null, "variables", null, 0, -1, VLSUniversalQuantifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getVLSUniversalQuantifier_Variables(), this.getVLSTffTerm(), null, "variables", null, 0, -1, VLSUniversalQuantifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEReference(getVLSUniversalQuantifier_Operand(), this.getVLSTerm(), null, "operand", null, 0, 1, VLSUniversalQuantifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsExistentialQuantifierEClass, VLSExistentialQuantifier.class, "VLSExistentialQuantifier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-    initEReference(getVLSExistentialQuantifier_Variables(), this.getVLSVariableDeclaration(), null, "variables", null, 0, -1, VLSExistentialQuantifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getVLSExistentialQuantifier_Variables(), this.getVLSTffTerm(), null, "variables", null, 0, -1, VLSExistentialQuantifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

     initEReference(getVLSExistentialQuantifier_Operand(), this.getVLSTerm(), null, "operand", null, 0, 1, VLSExistentialQuantifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

     initEClass(vlsUnaryNegationEClass, VLSUnaryNegation.class, "VLSUnaryNegation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java
index e4aae7f8..193ac81b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/src-gen/ca/mcgill/ecse/dslreasoner/vampireLanguage/util/VampireLanguageSwitch.java
@@ -159,8 +159,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
       {

         VLSTerm vlsTerm = (VLSTerm)theEObject;

         T result = caseVLSTerm(vlsTerm);

-        if (result == null) result = caseVLSOtherDeclaration(vlsTerm);

-        if (result == null) result = caseVLSDeclaration(vlsTerm);

         if (result == null) result = caseVLSTffTerm(vlsTerm);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -169,10 +167,7 @@ public class VampireLanguageSwitch<T> extends Switch<T>
       {

         VLSVariable vlsVariable = (VLSVariable)theEObject;

         T result = caseVLSVariable(vlsVariable);

-        if (result == null) result = caseVLSVariableDeclaration(vlsVariable);

         if (result == null) result = caseVLSTerm(vlsVariable);

-        if (result == null) result = caseVLSOtherDeclaration(vlsVariable);

-        if (result == null) result = caseVLSDeclaration(vlsVariable);

         if (result == null) result = caseVLSTffTerm(vlsVariable);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -182,8 +177,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSFunctionAsTerm vlsFunctionAsTerm = (VLSFunctionAsTerm)theEObject;

         T result = caseVLSFunctionAsTerm(vlsFunctionAsTerm);

         if (result == null) result = caseVLSTerm(vlsFunctionAsTerm);

-        if (result == null) result = caseVLSOtherDeclaration(vlsFunctionAsTerm);

-        if (result == null) result = caseVLSDeclaration(vlsFunctionAsTerm);

         if (result == null) result = caseVLSTffTerm(vlsFunctionAsTerm);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -193,8 +186,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSDefinedTerm vlsDefinedTerm = (VLSDefinedTerm)theEObject;

         T result = caseVLSDefinedTerm(vlsDefinedTerm);

         if (result == null) result = caseVLSTerm(vlsDefinedTerm);

-        if (result == null) result = caseVLSOtherDeclaration(vlsDefinedTerm);

-        if (result == null) result = caseVLSDeclaration(vlsDefinedTerm);

         if (result == null) result = caseVLSTffTerm(vlsDefinedTerm);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -236,8 +227,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSEquivalent vlsEquivalent = (VLSEquivalent)theEObject;

         T result = caseVLSEquivalent(vlsEquivalent);

         if (result == null) result = caseVLSTerm(vlsEquivalent);

-        if (result == null) result = caseVLSOtherDeclaration(vlsEquivalent);

-        if (result == null) result = caseVLSDeclaration(vlsEquivalent);

         if (result == null) result = caseVLSTffTerm(vlsEquivalent);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -247,8 +236,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSImplies vlsImplies = (VLSImplies)theEObject;

         T result = caseVLSImplies(vlsImplies);

         if (result == null) result = caseVLSTerm(vlsImplies);

-        if (result == null) result = caseVLSOtherDeclaration(vlsImplies);

-        if (result == null) result = caseVLSDeclaration(vlsImplies);

         if (result == null) result = caseVLSTffTerm(vlsImplies);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -258,8 +245,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSRevImplies vlsRevImplies = (VLSRevImplies)theEObject;

         T result = caseVLSRevImplies(vlsRevImplies);

         if (result == null) result = caseVLSTerm(vlsRevImplies);

-        if (result == null) result = caseVLSOtherDeclaration(vlsRevImplies);

-        if (result == null) result = caseVLSDeclaration(vlsRevImplies);

         if (result == null) result = caseVLSTffTerm(vlsRevImplies);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -269,8 +254,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSXnor vlsXnor = (VLSXnor)theEObject;

         T result = caseVLSXnor(vlsXnor);

         if (result == null) result = caseVLSTerm(vlsXnor);

-        if (result == null) result = caseVLSOtherDeclaration(vlsXnor);

-        if (result == null) result = caseVLSDeclaration(vlsXnor);

         if (result == null) result = caseVLSTffTerm(vlsXnor);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -280,8 +263,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSNor vlsNor = (VLSNor)theEObject;

         T result = caseVLSNor(vlsNor);

         if (result == null) result = caseVLSTerm(vlsNor);

-        if (result == null) result = caseVLSOtherDeclaration(vlsNor);

-        if (result == null) result = caseVLSDeclaration(vlsNor);

         if (result == null) result = caseVLSTffTerm(vlsNor);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -291,8 +272,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSNand vlsNand = (VLSNand)theEObject;

         T result = caseVLSNand(vlsNand);

         if (result == null) result = caseVLSTerm(vlsNand);

-        if (result == null) result = caseVLSOtherDeclaration(vlsNand);

-        if (result == null) result = caseVLSDeclaration(vlsNand);

         if (result == null) result = caseVLSTffTerm(vlsNand);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -302,8 +281,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSAnd vlsAnd = (VLSAnd)theEObject;

         T result = caseVLSAnd(vlsAnd);

         if (result == null) result = caseVLSTerm(vlsAnd);

-        if (result == null) result = caseVLSOtherDeclaration(vlsAnd);

-        if (result == null) result = caseVLSDeclaration(vlsAnd);

         if (result == null) result = caseVLSTffTerm(vlsAnd);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -313,8 +290,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSOr vlsOr = (VLSOr)theEObject;

         T result = caseVLSOr(vlsOr);

         if (result == null) result = caseVLSTerm(vlsOr);

-        if (result == null) result = caseVLSOtherDeclaration(vlsOr);

-        if (result == null) result = caseVLSDeclaration(vlsOr);

         if (result == null) result = caseVLSTffTerm(vlsOr);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -324,8 +299,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSUniversalQuantifier vlsUniversalQuantifier = (VLSUniversalQuantifier)theEObject;

         T result = caseVLSUniversalQuantifier(vlsUniversalQuantifier);

         if (result == null) result = caseVLSTerm(vlsUniversalQuantifier);

-        if (result == null) result = caseVLSOtherDeclaration(vlsUniversalQuantifier);

-        if (result == null) result = caseVLSDeclaration(vlsUniversalQuantifier);

         if (result == null) result = caseVLSTffTerm(vlsUniversalQuantifier);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -335,8 +308,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSExistentialQuantifier vlsExistentialQuantifier = (VLSExistentialQuantifier)theEObject;

         T result = caseVLSExistentialQuantifier(vlsExistentialQuantifier);

         if (result == null) result = caseVLSTerm(vlsExistentialQuantifier);

-        if (result == null) result = caseVLSOtherDeclaration(vlsExistentialQuantifier);

-        if (result == null) result = caseVLSDeclaration(vlsExistentialQuantifier);

         if (result == null) result = caseVLSTffTerm(vlsExistentialQuantifier);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -346,8 +317,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSUnaryNegation vlsUnaryNegation = (VLSUnaryNegation)theEObject;

         T result = caseVLSUnaryNegation(vlsUnaryNegation);

         if (result == null) result = caseVLSTerm(vlsUnaryNegation);

-        if (result == null) result = caseVLSOtherDeclaration(vlsUnaryNegation);

-        if (result == null) result = caseVLSDeclaration(vlsUnaryNegation);

         if (result == null) result = caseVLSTffTerm(vlsUnaryNegation);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -357,8 +326,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSInequality vlsInequality = (VLSInequality)theEObject;

         T result = caseVLSInequality(vlsInequality);

         if (result == null) result = caseVLSTerm(vlsInequality);

-        if (result == null) result = caseVLSOtherDeclaration(vlsInequality);

-        if (result == null) result = caseVLSDeclaration(vlsInequality);

         if (result == null) result = caseVLSTffTerm(vlsInequality);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -368,8 +335,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSEquality vlsEquality = (VLSEquality)theEObject;

         T result = caseVLSEquality(vlsEquality);

         if (result == null) result = caseVLSTerm(vlsEquality);

-        if (result == null) result = caseVLSOtherDeclaration(vlsEquality);

-        if (result == null) result = caseVLSDeclaration(vlsEquality);

         if (result == null) result = caseVLSTffTerm(vlsEquality);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -379,8 +344,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSAssignment vlsAssignment = (VLSAssignment)theEObject;

         T result = caseVLSAssignment(vlsAssignment);

         if (result == null) result = caseVLSTerm(vlsAssignment);

-        if (result == null) result = caseVLSOtherDeclaration(vlsAssignment);

-        if (result == null) result = caseVLSDeclaration(vlsAssignment);

         if (result == null) result = caseVLSTffTerm(vlsAssignment);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -390,8 +353,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSConstant vlsConstant = (VLSConstant)theEObject;

         T result = caseVLSConstant(vlsConstant);

         if (result == null) result = caseVLSTerm(vlsConstant);

-        if (result == null) result = caseVLSOtherDeclaration(vlsConstant);

-        if (result == null) result = caseVLSDeclaration(vlsConstant);

         if (result == null) result = caseVLSTffTerm(vlsConstant);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -401,8 +362,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSTrue vlsTrue = (VLSTrue)theEObject;

         T result = caseVLSTrue(vlsTrue);

         if (result == null) result = caseVLSTerm(vlsTrue);

-        if (result == null) result = caseVLSOtherDeclaration(vlsTrue);

-        if (result == null) result = caseVLSDeclaration(vlsTrue);

         if (result == null) result = caseVLSTffTerm(vlsTrue);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -412,8 +371,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSFalse vlsFalse = (VLSFalse)theEObject;

         T result = caseVLSFalse(vlsFalse);

         if (result == null) result = caseVLSTerm(vlsFalse);

-        if (result == null) result = caseVLSOtherDeclaration(vlsFalse);

-        if (result == null) result = caseVLSDeclaration(vlsFalse);

         if (result == null) result = caseVLSTffTerm(vlsFalse);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -423,8 +380,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSFunction vlsFunction = (VLSFunction)theEObject;

         T result = caseVLSFunction(vlsFunction);

         if (result == null) result = caseVLSTerm(vlsFunction);

-        if (result == null) result = caseVLSOtherDeclaration(vlsFunction);

-        if (result == null) result = caseVLSDeclaration(vlsFunction);

         if (result == null) result = caseVLSTffTerm(vlsFunction);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -434,8 +389,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         VLSLess vlsLess = (VLSLess)theEObject;

         T result = caseVLSLess(vlsLess);

         if (result == null) result = caseVLSTerm(vlsLess);

-        if (result == null) result = caseVLSOtherDeclaration(vlsLess);

-        if (result == null) result = caseVLSDeclaration(vlsLess);

         if (result == null) result = caseVLSTffTerm(vlsLess);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -446,8 +399,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         T result = caseVLSInt(vlsInt);

         if (result == null) result = caseVLSDefinedTerm(vlsInt);

         if (result == null) result = caseVLSTerm(vlsInt);

-        if (result == null) result = caseVLSOtherDeclaration(vlsInt);

-        if (result == null) result = caseVLSDeclaration(vlsInt);

         if (result == null) result = caseVLSTffTerm(vlsInt);

         if (result == null) result = defaultCase(theEObject);

         return result;

@@ -458,8 +409,6 @@ public class VampireLanguageSwitch<T> extends Switch<T>
         T result = caseVLSDoubleQuote(vlsDoubleQuote);

         if (result == null) result = caseVLSDefinedTerm(vlsDoubleQuote);

         if (result == null) result = caseVLSTerm(vlsDoubleQuote);

-        if (result == null) result = caseVLSOtherDeclaration(vlsDoubleQuote);

-        if (result == null) result = caseVLSDeclaration(vlsDoubleQuote);

         if (result == null) result = caseVLSTffTerm(vlsDoubleQuote);

         if (result == null) result = defaultCase(theEObject);

         return result;

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 1b115d45..cd640556 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
@@ -220,11 +220,11 @@ VLSDeclaration:
 ;
 
 VLSOtherDeclaration:
-        VLSAtomicConstant ':' type = VLSTypeDef
+        name = VLSAtomicConstant ':' type = VLSTypeDef
 ;
 
 VLSVariableDeclaration:
-        VLSVariable ':' type = VLSTypeDef
+        name = VLSVariable ':' type = VLSTypeDef
 ;
 
 VLSTypeDef:

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.xtend
index e94584ae..7ab15fba 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.xtend
@@ -35,6 +35,7 @@ class Logic2VampireLanguageMapperTrace {
         public var topLevelType = null
         
         public val Map<Type, VLSFunction> type2Predicate = new HashMap;
+        public val Map<VLSFunction, Type> predicate2Type = new HashMap;
         public val Map<DefinedElement, VLSFunction> element2Predicate = new HashMap
         public val Map<Type, VLSTerm> type2PossibleNot = new HashMap
         public val Map<Type, VLSTerm> type2And = new HashMap
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend
index 1b30393f..d2a01e0e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.xtend
@@ -42,6 +42,7 @@ class Logic2VampireLanguageMapper_TypeMapper {
                                 it.terms += support.duplicate(variable)
                         ]
                         trace.type2Predicate.put(type, typePred)
+                        trace.predicate2Type.put(typePred, type)
                 }
 
                 // 2. Map each ENUM/InitialModelElement type definition to fof formula
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/VampireModelInterpretation.xtend b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/VampireModelInterpretation.xtend
index c2cffa6b..0c93e3fe 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/VampireModelInterpretation.xtend
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/VampireModelInterpretation.xtend
@@ -1,49 +1,182 @@
 package ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder
 
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSConstant
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquality
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffFormula
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireModel
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSAndImpl
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSOrImpl
+import ca.mcgill.ecse.dslreasoner.vampireLanguage.impl.VLSUnaryNegationImpl
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicModelInterpretation
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ConstantDeclaration
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.FunctionDeclaration
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguageFactory
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.TypeDeclarationImpl
+import java.util.HashMap
+import java.util.List
+import java.util.Map
+
+import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
 
 class VampireModelInterpretation implements LogicModelInterpretation {
         protected val extension LogiclanguageFactory factory = LogiclanguageFactory.eINSTANCE
-        
+
         protected val Logic2VampireLanguageMapperTrace forwardTrace;
-        
-        
+
+        private val Map<String, DefinedElement> name2DefinedElement = new HashMap
+        private val Map<TypeDeclaration, List<DefinedElement>> type2DefinedElement = new HashMap
+
+        var num = -1
+
         public new(VampireModel model, Logic2VampireLanguageMapperTrace trace) {
                 this.forwardTrace = trace
+
+                // 1. look at "finite_domain" formula (there should only be one)
+                // IN REALITY THE DEFINED ELEMENTS ARE DEFINED AS <nameOfDefinedEement>:$i
+                // SPECIFICALLY, THESE ARE "TYPE" FORMULAS
+                val finDomFormula = model.tfformulas.filter[name == "finite_domain"].get(0) as VLSTffFormula
+                val univQuant = finDomFormula.fofFormula as VLSUniversalQuantifier
+                var orFormulaTerm = univQuant.operand
+
+                var end = false
+                while (!end) {
+                        if (orFormulaTerm.class == VLSOrImpl) {
+                                val orFormula = orFormulaTerm as VLSOr
+                                val orRight = orFormula.right as VLSEquality
+                                add2ConstDefMap(orRight)
+                                orFormulaTerm = orFormula.left
+                        } else {
+                                val firstTerm = orFormulaTerm as VLSEquality
+                                add2ConstDefMap(firstTerm)
+                                end = true
+                        }
+
+                }
+
+                // 2. associate each type to defined elements
+//              println(trace.type2Predicate.keySet)
+//              println(trace.type2Predicate.keySet.length)
+//              println(trace.type2Predicate.keySet.filter[class == TypeDeclarationImpl])
+//              println(trace.type2Predicate.keySet.filter[class == TypeDeclarationImpl].length)
+//              println()
+//              println(trace.type2Predicate)
+                // Fill keys of map
+                val allTypeDecls = trace.type2Predicate.keySet.filter[class == TypeDeclarationImpl]
+                val allTypeFunctions = trace.predicate2Type
+
+                for (type : allTypeDecls) {
+                        type2DefinedElement.put(type as TypeDeclaration, newArrayList)
+                }
+
+                // USE THE DECLARE_<TYPE_NAME> FORMULAS TO SEE WHAT THE TYPES ARE
+                val typeFormulas = model.tfformulas.filter[name.length > 12 && name.substring(0, 12) == "predicate_t_"]
+                // ^this way, we ignore the "object" type
+                //TODO potentially need to handle the enums in this case as well
+                for (formula : typeFormulas) {
+                        // get associated type
+                        val associatedTypeName = (formula as VLSTffFormula).name.substring(10)
+                        val associatedFunction = allTypeFunctions.keySet.filter[constant == associatedTypeName].
+                                get(0) as VLSFunction
+                        val associatedTypeAll = associatedFunction.lookup(allTypeFunctions)
+//                      val associatedTypeDeclFormula = model.tfformulas.filter[name == ("declare_t_" + associatedTypeName)].get(0) as VLSTffFormula
+//                      val associatedTypeDefn = associatedTypeDeclFormula.fofFormula as VLSOtherDeclaration
+//                      val associatedTypeFct = associatedTypeDefn.name as VLSConstant
+                        if (associatedTypeAll.class == TypeDeclarationImpl) {
+                                val associatedType = associatedTypeAll as TypeDeclaration
+
+                                // get definedElements
+                                var andFormulaTerm = formula.fofFormula
+                                end = false
+                                val List<DefinedElement> instances = newArrayList
+                                while (!end) {
+                                        if (andFormulaTerm.class == VLSAndImpl) {
+                                                val andFormula = andFormulaTerm as VLSAnd
+                                                val andRight = andFormula.right
+                                                addIfNotNeg(andRight, instances)
+                                                andFormulaTerm = andFormula.left
+                                        } else {
+                                                addIfNotNeg(andFormulaTerm as VLSTerm, instances)
+                                                end = true
+                                        }
+
+                                }
+                                for (elem : instances) {
+                                        associatedType.lookup(type2DefinedElement).add(elem)
+                                }
+                        }
+                }
+
+                printMap()
+
         }
-        
-        override getElements(Type type) {
-                throw new UnsupportedOperationException("TODO: auto-generated method stub")
+
+        def printMap() {
+                for (key : type2DefinedElement.keySet) {
+                        println(key.name + "==>")
+                        for (elem : key.lookup(type2DefinedElement)) {
+                                print(elem.name + ", ")
+                        }
+                        println()
+
+                }
+                println()
         }
-        
+
+        def private addIfNotNeg(VLSTerm term, List<DefinedElement> list) {
+                if (term.class != VLSUnaryNegationImpl) {
+                        val nodeName = ((term as VLSFunction).terms.get(0) as VLSFunctionAsTerm).functor
+                        val defnElem = nodeName.lookup(name2DefinedElement)
+                        list.add(defnElem)
+                }
+        }
+
+        def private add2ConstDefMap(VLSEquality eq) {
+                val defElemConst = (eq.right as VLSConstant)
+                val definedElement = createDefinedElement => [name = defElemConst.name]
+                this.name2DefinedElement.put(defElemConst.name, definedElement)
+        }
+
+        override getElements(Type type) { getElementsDispatch(type) }
+
+        def private dispatch getElementsDispatch(TypeDeclaration declaration) {
+                return declaration.lookup(this.type2DefinedElement)
+        }
+
+        def private dispatch getElementsDispatch(TypeDefinition declaration) { return declaration.elements }
+
         override getInterpretation(FunctionDeclaration function, Object[] parameterSubstitution) {
                 throw new UnsupportedOperationException("TODO: auto-generated method stub")
         }
-        
+
         override getInterpretation(RelationDeclaration relation, Object[] parameterSubstitution) {
                 throw new UnsupportedOperationException("TODO: auto-generated method stub")
         }
-        
+
         override getInterpretation(ConstantDeclaration constant) {
                 throw new UnsupportedOperationException("TODO: auto-generated method stub")
         }
-        
+
         override getAllIntegersInStructure() {
-                throw new UnsupportedOperationException("TODO: auto-generated method stub")
+                return null
         }
-        
+
         override getAllRealsInStructure() {
-                throw new UnsupportedOperationException("TODO: auto-generated method stub")
+                return null
         }
-        
+
         override getAllStringsInStructure() {
-                throw new UnsupportedOperationException("TODO: auto-generated method stub")
+                return null
         }
-        
-}
\ No newline at end of file
+
+}
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
index 298a6c08..0fafa9e9 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
index 863b572e..7174bfba 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
index 410f2550..af66dabc 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
index b1b39a4f..b9301875 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
index 3710e753..88c3e932 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
index 9dc7abaf..e3437e53 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
index 7029d196..1a884261 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
index 03aead59..7e2aba1c 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
index 62960704..187a0447 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
index 56a10b3c..ee115b16 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.java
index c2ae099e..4537240e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapperTrace.java
@@ -37,6 +37,8 @@ public class Logic2VampireLanguageMapperTrace {
   

   public final Map<Type, VLSFunction> type2Predicate = new HashMap<Type, VLSFunction>();

   

+  public final Map<VLSFunction, Type> predicate2Type = new HashMap<VLSFunction, Type>();

+  

   public final Map<DefinedElement, VLSFunction> element2Predicate = new HashMap<DefinedElement, VLSFunction>();

   

   public final Map<Type, VLSTerm> type2PossibleNot = new HashMap<Type, VLSTerm>();

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.java
index 7daf1b2f..2100b92f 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ContainmentMapper.java
@@ -12,10 +12,10 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffTerm;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable;

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

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory;

 import com.google.common.base.Objects;

 import com.google.common.collect.Iterables;

@@ -123,7 +123,7 @@ public class Logic2VampireLanguageMapper_ContainmentMapper {
       it.setFofRole("axiom");

       VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

       final Procedure1<VLSUniversalQuantifier> _function_1 = (VLSUniversalQuantifier it_1) -> {

-        EList<VLSVariableDeclaration> _variables = it_1.getVariables();

+        EList<VLSTffTerm> _variables = it_1.getVariables();

         VLSVariable _duplicate = this.support.duplicate(this.variable);

         _variables.add(_duplicate);

         VLSEquivalent _createVLSEquivalent = this.factory.createVLSEquivalent();

@@ -193,10 +193,10 @@ public class Logic2VampireLanguageMapper_ContainmentMapper {
           it.setFofRole("axiom");

           VLSExistentialQuantifier _createVLSExistentialQuantifier = this.factory.createVLSExistentialQuantifier();

           final Procedure1<VLSExistentialQuantifier> _function_5 = (VLSExistentialQuantifier it_1) -> {

-            EList<VLSVariableDeclaration> _variables = it_1.getVariables();

+            EList<VLSTffTerm> _variables = it_1.getVariables();

             VLSVariable _duplicate = this.support.duplicate(varA);

             _variables.add(_duplicate);

-            EList<VLSVariableDeclaration> _variables_1 = it_1.getVariables();

+            EList<VLSTffTerm> _variables_1 = it_1.getVariables();

             VLSVariable _duplicate_1 = this.support.duplicate(varB);

             _variables_1.add(_duplicate_1);

             VLSImplies _createVLSImplies = this.factory.createVLSImplies();

@@ -206,10 +206,10 @@ public class Logic2VampireLanguageMapper_ContainmentMapper {
               final Procedure1<VLSUnaryNegation> _function_7 = (VLSUnaryNegation it_3) -> {

                 VLSExistentialQuantifier _createVLSExistentialQuantifier_1 = this.factory.createVLSExistentialQuantifier();

                 final Procedure1<VLSExistentialQuantifier> _function_8 = (VLSExistentialQuantifier it_4) -> {

-                  EList<VLSVariableDeclaration> _variables_2 = it_4.getVariables();

+                  EList<VLSTffTerm> _variables_2 = it_4.getVariables();

                   VLSVariable _duplicate_2 = this.support.duplicate(varC);

                   _variables_2.add(_duplicate_2);

-                  EList<VLSVariableDeclaration> _variables_3 = it_4.getVariables();

+                  EList<VLSTffTerm> _variables_3 = it_4.getVariables();

                   VLSVariable _duplicate_3 = this.support.duplicate(varB);

                   _variables_3.add(_duplicate_3);

                   it_4.setOperand(this.support.duplicate(rel, CollectionLiterals.<VLSVariable>newArrayList(varC, varB)));

@@ -240,7 +240,7 @@ public class Logic2VampireLanguageMapper_ContainmentMapper {
           it.setFofRole("axiom");

           VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

           final Procedure1<VLSUniversalQuantifier> _function_5 = (VLSUniversalQuantifier it_1) -> {

-            EList<VLSVariableDeclaration> _variables = it_1.getVariables();

+            EList<VLSTffTerm> _variables = it_1.getVariables();

             VLSVariable _duplicate = this.support.duplicate(varA);

             _variables.add(_duplicate);

             VLSImplies _createVLSImplies = this.factory.createVLSImplies();

@@ -248,7 +248,7 @@ public class Logic2VampireLanguageMapper_ContainmentMapper {
               it_2.setLeft(this.support.duplicate(e.getKey(), varA));

               VLSExistentialQuantifier _createVLSExistentialQuantifier = this.factory.createVLSExistentialQuantifier();

               final Procedure1<VLSExistentialQuantifier> _function_7 = (VLSExistentialQuantifier it_3) -> {

-                EList<VLSVariableDeclaration> _variables_1 = it_3.getVariables();

+                EList<VLSTffTerm> _variables_1 = it_3.getVariables();

                 VLSVariable _duplicate_1 = this.support.duplicate(varB);

                 _variables_1.add(_duplicate_1);

                 int _length_1 = ((Object[])Conversions.unwrapArray(e.getValue(), Object.class)).length;

@@ -308,9 +308,9 @@ public class Logic2VampireLanguageMapper_ContainmentMapper {
           final Procedure1<VLSUnaryNegation> _function_6 = (VLSUnaryNegation it_1) -> {

             VLSExistentialQuantifier _createVLSExistentialQuantifier = this.factory.createVLSExistentialQuantifier();

             final Procedure1<VLSExistentialQuantifier> _function_7 = (VLSExistentialQuantifier it_2) -> {

-              EList<VLSVariableDeclaration> _variables = it_2.getVariables();

+              EList<VLSTffTerm> _variables = it_2.getVariables();

               List<VLSVariable> _duplicate = this.support.duplicate(variables);

-              Iterables.<VLSVariableDeclaration>addAll(_variables, _duplicate);

+              Iterables.<VLSTffTerm>addAll(_variables, _duplicate);

               it_2.setOperand(this.support.unfoldAnd(conjunctionList));

             };

             VLSExistentialQuantifier _doubleArrow_1 = ObjectExtensions.<VLSExistentialQuantifier>operator_doubleArrow(_createVLSExistentialQuantifier, _function_7);

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_RelationMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_RelationMapper.java
index 657c3292..8d36952b 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_RelationMapper.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_RelationMapper.java
@@ -7,9 +7,9 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffTerm;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable;

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

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ComplexTypeReference;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation;

@@ -77,7 +77,7 @@ public class Logic2VampireLanguageMapper_RelationMapper {
       VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

       final Procedure1<VLSUniversalQuantifier> _function_1 = (VLSUniversalQuantifier it_1) -> {

         for (final VLSVariable v : relVar2VLS) {

-          EList<VLSVariableDeclaration> _variables = it_1.getVariables();

+          EList<VLSTffTerm> _variables = it_1.getVariables();

           VLSVariable _duplicate = this.support.duplicate(v);

           _variables.add(_duplicate);

         }

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java
index 6d4767a7..6da75271 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_ScopeMapper.java
@@ -11,9 +11,9 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffTerm;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable;

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

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory;

 import com.google.common.base.Objects;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement;

@@ -245,7 +245,7 @@ public class Logic2VampireLanguageMapper_ScopeMapper {
       it.setFofRole("axiom");

       VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

       final Procedure1<VLSUniversalQuantifier> _function_2 = (VLSUniversalQuantifier it_1) -> {

-        EList<VLSVariableDeclaration> _variables = it_1.getVariables();

+        EList<VLSTffTerm> _variables = it_1.getVariables();

         VLSVariable _duplicate = this.support.duplicate(this.variable);

         _variables.add(_duplicate);

         VLSImplies _createVLSImplies = this.factory.createVLSImplies();

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java
index 6cd53fae..dae0df6e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_Support.java
@@ -11,9 +11,9 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSImplies;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffTerm;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable;

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

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory;

 import com.google.common.base.Objects;

 import com.google.common.collect.Iterables;

@@ -324,9 +324,9 @@ public class Logic2VampireLanguageMapper_Support {
       if (isUniversal) {

         VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

         final Procedure1<VLSUniversalQuantifier> _function_1 = (VLSUniversalQuantifier it) -> {

-          EList<VLSVariableDeclaration> _variables = it.getVariables();

+          EList<VLSTffTerm> _variables = it.getVariables();

           Collection<VLSVariable> _values = variableMap.values();

-          Iterables.<VLSVariableDeclaration>addAll(_variables, _values);

+          Iterables.<VLSTffTerm>addAll(_variables, _values);

           VLSImplies _createVLSImplies = this.factory.createVLSImplies();

           final Procedure1<VLSImplies> _function_2 = (VLSImplies it_1) -> {

             it_1.setLeft(this.unfoldAnd(typedefs));

@@ -342,9 +342,9 @@ public class Logic2VampireLanguageMapper_Support {
           typedefs.add(mapper.transformTerm(expression.getExpression(), trace, this.withAddition(variables, variableMap)));

           VLSExistentialQuantifier _createVLSExistentialQuantifier = this.factory.createVLSExistentialQuantifier();

           final Procedure1<VLSExistentialQuantifier> _function_2 = (VLSExistentialQuantifier it) -> {

-            EList<VLSVariableDeclaration> _variables = it.getVariables();

+            EList<VLSTffTerm> _variables = it.getVariables();

             Collection<VLSVariable> _values = variableMap.values();

-            Iterables.<VLSVariableDeclaration>addAll(_variables, _values);

+            Iterables.<VLSTffTerm>addAll(_variables, _values);

             it.setOperand(this.unfoldAnd(typedefs));

           };

           _xblockexpression_1 = ObjectExtensions.<VLSExistentialQuantifier>operator_doubleArrow(_createVLSExistentialQuantifier, _function_2);

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java
index 7921f204..c8888eb0 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/Logic2VampireLanguageMapper_TypeMapper.java
@@ -12,10 +12,10 @@ import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula;
 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTerm;

+import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSTffTerm;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier;

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSVariable;

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

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory;

 import com.google.common.base.Objects;

 import com.google.common.collect.Iterables;

@@ -76,6 +76,7 @@ public class Logic2VampireLanguageMapper_TypeMapper {
           };

           final VLSFunction typePred = ObjectExtensions.<VLSFunction>operator_doubleArrow(_createVLSFunction, _function_1);

           trace.type2Predicate.put(type, typePred);

+          trace.predicate2Type.put(typePred, type);

         }

       }

       final Function1<TypeDefinition, Boolean> _function_1 = (TypeDefinition it) -> {

@@ -144,7 +145,7 @@ public class Logic2VampireLanguageMapper_TypeMapper {
             it.setFofRole("axiom");

             VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

             final Procedure1<VLSUniversalQuantifier> _function_3 = (VLSUniversalQuantifier it_1) -> {

-              EList<VLSVariableDeclaration> _variables = it_1.getVariables();

+              EList<VLSTffTerm> _variables = it_1.getVariables();

               VLSVariable _duplicate = this.support.duplicate(variable);

               _variables.add(_duplicate);

               VLSEquivalent _createVLSEquivalent = this.factory.createVLSEquivalent();

@@ -194,7 +195,7 @@ public class Logic2VampireLanguageMapper_TypeMapper {
                 it.setFofRole("axiom");

                 VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

                 final Procedure1<VLSUniversalQuantifier> _function_5 = (VLSUniversalQuantifier it_1) -> {

-                  EList<VLSVariableDeclaration> _variables = it_1.getVariables();

+                  EList<VLSTffTerm> _variables = it_1.getVariables();

                   VLSVariable _duplicate = this.support.duplicate(variable);

                   _variables.add(_duplicate);

                   VLSEquivalent _createVLSEquivalent = this.factory.createVLSEquivalent();

@@ -264,7 +265,7 @@ public class Logic2VampireLanguageMapper_TypeMapper {
         it.setFofRole("axiom");

         VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

         final Procedure1<VLSUniversalQuantifier> _function_5 = (VLSUniversalQuantifier it_1) -> {

-          EList<VLSVariableDeclaration> _variables = it_1.getVariables();

+          EList<VLSTffTerm> _variables = it_1.getVariables();

           VLSVariable _duplicate = this.support.duplicate(variable);

           _variables.add(_duplicate);

           VLSEquivalent _createVLSEquivalent = this.factory.createVLSEquivalent();

@@ -292,7 +293,7 @@ public class Logic2VampireLanguageMapper_TypeMapper {
         it.setFofRole("axiom");

         VLSUniversalQuantifier _createVLSUniversalQuantifier = this.factory.createVLSUniversalQuantifier();

         final Procedure1<VLSUniversalQuantifier> _function_6 = (VLSUniversalQuantifier it_1) -> {

-          EList<VLSVariableDeclaration> _variables = it_1.getVariables();

+          EList<VLSTffTerm> _variables = it_1.getVariables();

           VLSVariable _duplicate = this.support.duplicate(variable);

           _variables.add(_duplicate);

           VLSEquivalent _createVLSEquivalent = this.factory.createVLSEquivalent();

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
index 0c59b077..4efbc821 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
@@ -2,6 +2,7 @@ package ca.mcgill.ecse.dslreasoner.vampire.icse
 

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration

+import ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder.VampireModelInterpretation

 import functionalarchitecture.Function

 import functionalarchitecture.FunctionalArchitectureModel

 import functionalarchitecture.FunctionalInterface

@@ -17,6 +18,7 @@ import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace

 import java.util.HashMap

+import java.util.List

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

 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl

 

@@ -97,8 +99,10 @@ class FAMTest {
                 var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace)

                 

                 //visualisation, see 

-//              var interpretations = reasoner.getInterpretations(solution as ModelResult)

-//              

+                var interpretations = reasoner.getInterpretations(solution as ModelResult)

+                interpretations.get(0) as VampireModelInterpretation

+                println(ecore2Logic.allAttributesInScope(modelGenerationProblem.trace))

+                

 //              for(interpretation : interpretations) {

 //                      val model = logic2Ecore.transformInterpretation(interpretation,modelGenerationProblem.trace)

 //                      //look here: hu.bme.mit.inf.dslreasoner.application.execution.GenerationTaskExecutor

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
index 292bf88e..18295021 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
index aca97399..71f522de 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
@@ -12,17 +12,21 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;
 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel;

+import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicModelInterpretation;

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;

 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;

+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult;

 import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore;

 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;

 import java.util.HashMap;

+import java.util.List;

 import java.util.Map;

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

+import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EObject;

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

 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;

@@ -95,6 +99,9 @@ public class FAMTest {
       };

       final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function);

       LogicResult solution = reasoner.solve(problem, vampireConfig, workspace);

+      List<? extends LogicModelInterpretation> interpretations = reasoner.getInterpretations(((ModelResult) solution));

+      interpretations.get(0);

+      InputOutput.<Iterable<EAttribute>>println(ecore2Logic.allAttributesInScope(modelGenerationProblem.getTrace()));

       long _currentTimeMillis = System.currentTimeMillis();

       long _minus = (_currentTimeMillis - startTime);

       long totalTimeMin = (_minus / 60000);