1 files changed, 495 insertions, 423 deletions

diff --git a/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java b/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
index 36b14a55..8e000971 100644
--- a/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
+++ b/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
@@ -50,6 +50,9 @@ public class InternalProblemLexer extends Lexer {
     public static final int RULE_WS=10;
     public static final int RULE_ANY_OTHER=11;
     public static final int T__44=44;
+    public static final int T__45=45;
+    public static final int T__46=46;
+    public static final int T__47=47;
     public static final int T__40=40;
     public static final int T__41=41;
     public static final int T__42=42;
@@ -257,11 +260,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:20:7: ( 'unknown' )
-            // InternalProblem.g:20:9: 'unknown'
+            // InternalProblem.g:20:7: ( 'e' )
+            // InternalProblem.g:20:9: 'e'
             {
-            match("unknown"); 
-
+            match('e'); 
 
             }
 
@@ -278,10 +280,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:21:7: ( '!' )
-            // InternalProblem.g:21:9: '!'
+            // InternalProblem.g:21:7: ( 'E' )
+            // InternalProblem.g:21:9: 'E'
             {
-            match('!'); 
+            match('E'); 
 
             }
 
@@ -298,10 +300,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:22:7: ( '?' )
-            // InternalProblem.g:22:9: '?'
+            // InternalProblem.g:22:7: ( '-' )
+            // InternalProblem.g:22:9: '-'
             {
-            match('?'); 
+            match('-'); 
 
             }
 
@@ -318,11 +320,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:23:7: ( 'problem' )
-            // InternalProblem.g:23:9: 'problem'
+            // InternalProblem.g:23:7: ( '+' )
+            // InternalProblem.g:23:9: '+'
             {
-            match("problem"); 
-
+            match('+'); 
 
             }
 
@@ -339,10 +340,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:24:7: ( 'class' )
-            // InternalProblem.g:24:9: 'class'
+            // InternalProblem.g:24:7: ( 'unknown' )
+            // InternalProblem.g:24:9: 'unknown'
             {
-            match("class"); 
+            match("unknown"); 
 
 
             }
@@ -360,11 +361,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:25:7: ( 'extends' )
-            // InternalProblem.g:25:9: 'extends'
+            // InternalProblem.g:25:7: ( '!' )
+            // InternalProblem.g:25:9: '!'
             {
-            match("extends"); 
-
+            match('!'); 
 
             }
 
@@ -381,10 +381,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:26:7: ( '{' )
-            // InternalProblem.g:26:9: '{'
+            // InternalProblem.g:26:7: ( '?' )
+            // InternalProblem.g:26:9: '?'
             {
-            match('{'); 
+            match('?'); 
 
             }
 
@@ -401,10 +401,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:27:7: ( '}' )
-            // InternalProblem.g:27:9: '}'
+            // InternalProblem.g:27:7: ( 'problem' )
+            // InternalProblem.g:27:9: 'problem'
             {
-            match('}'); 
+            match("problem"); 
+
 
             }
 
@@ -421,10 +422,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:28:7: ( 'enum' )
-            // InternalProblem.g:28:9: 'enum'
+            // InternalProblem.g:28:7: ( 'class' )
+            // InternalProblem.g:28:9: 'class'
             {
-            match("enum"); 
+            match("class"); 
 
 
             }
@@ -442,10 +443,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:29:7: ( '[' )
-            // InternalProblem.g:29:9: '['
+            // InternalProblem.g:29:7: ( 'extends' )
+            // InternalProblem.g:29:9: 'extends'
             {
-            match('['); 
+            match("extends"); 
+
 
             }
 
@@ -462,10 +464,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:30:7: ( ']' )
-            // InternalProblem.g:30:9: ']'
+            // InternalProblem.g:30:7: ( '{' )
+            // InternalProblem.g:30:9: '{'
             {
-            match(']'); 
+            match('{'); 
 
             }
 
@@ -482,11 +484,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:31:7: ( 'opposite' )
-            // InternalProblem.g:31:9: 'opposite'
+            // InternalProblem.g:31:7: ( '}' )
+            // InternalProblem.g:31:9: '}'
             {
-            match("opposite"); 
-
+            match('}'); 
 
             }
 
@@ -503,10 +504,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:32:7: ( '(' )
-            // InternalProblem.g:32:9: '('
+            // InternalProblem.g:32:7: ( 'enum' )
+            // InternalProblem.g:32:9: 'enum'
             {
-            match('('); 
+            match("enum"); 
+
 
             }
 
@@ -523,10 +525,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:33:7: ( ')' )
-            // InternalProblem.g:33:9: ')'
+            // InternalProblem.g:33:7: ( '[' )
+            // InternalProblem.g:33:9: '['
             {
-            match(')'); 
+            match('['); 
 
             }
 
@@ -543,11 +545,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:34:7: ( ':-' )
-            // InternalProblem.g:34:9: ':-'
+            // InternalProblem.g:34:7: ( ']' )
+            // InternalProblem.g:34:9: ']'
             {
-            match(":-"); 
-
+            match(']'); 
 
             }
 
@@ -564,10 +565,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:35:7: ( ':' )
-            // InternalProblem.g:35:9: ':'
+            // InternalProblem.g:35:7: ( 'opposite' )
+            // InternalProblem.g:35:9: 'opposite'
             {
-            match(':'); 
+            match("opposite"); 
+
 
             }
 
@@ -584,11 +586,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:36:7: ( 'scope' )
-            // InternalProblem.g:36:9: 'scope'
+            // InternalProblem.g:36:7: ( '(' )
+            // InternalProblem.g:36:9: '('
             {
-            match("scope"); 
-
+            match('('); 
 
             }
 
@@ -605,11 +606,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:37:7: ( '..' )
-            // InternalProblem.g:37:9: '..'
+            // InternalProblem.g:37:7: ( ')' )
+            // InternalProblem.g:37:9: ')'
             {
-            match(".."); 
-
+            match(')'); 
 
             }
 
@@ -626,10 +626,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:38:7: ( '::' )
-            // InternalProblem.g:38:9: '::'
+            // InternalProblem.g:38:7: ( ':-' )
+            // InternalProblem.g:38:9: ':-'
             {
-            match("::"); 
+            match(":-"); 
 
 
             }
@@ -647,11 +647,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:39:7: ( 'abstract' )
-            // InternalProblem.g:39:9: 'abstract'
+            // InternalProblem.g:39:7: ( ':' )
+            // InternalProblem.g:39:9: ':'
             {
-            match("abstract"); 
-
+            match(':'); 
 
             }
 
@@ -668,10 +667,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:40:7: ( 'contains' )
-            // InternalProblem.g:40:9: 'contains'
+            // InternalProblem.g:40:7: ( 'scope' )
+            // InternalProblem.g:40:9: 'scope'
             {
-            match("contains"); 
+            match("scope"); 
 
 
             }
@@ -689,10 +688,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:41:7: ( 'error' )
-            // InternalProblem.g:41:9: 'error'
+            // InternalProblem.g:41:7: ( '..' )
+            // InternalProblem.g:41:9: '..'
             {
-            match("error"); 
+            match(".."); 
 
 
             }
@@ -710,10 +709,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:42:7: ( '+' )
-            // InternalProblem.g:42:9: '+'
+            // InternalProblem.g:42:7: ( '::' )
+            // InternalProblem.g:42:9: '::'
             {
-            match('+'); 
+            match("::"); 
+
 
             }
 
@@ -730,10 +730,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:43:7: ( '+=' )
-            // InternalProblem.g:43:9: '+='
+            // InternalProblem.g:43:7: ( 'abstract' )
+            // InternalProblem.g:43:9: 'abstract'
             {
-            match("+="); 
+            match("abstract"); 
 
 
             }
@@ -746,32 +746,156 @@ public class InternalProblemLexer extends Lexer {
     }
     // $ANTLR end "T__44"
 
+    // $ANTLR start "T__45"
+    public final void mT__45() throws RecognitionException {
+        try {
+            int _type = T__45;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:44:7: ( 'contains' )
+            // InternalProblem.g:44:9: 'contains'
+            {
+            match("contains"); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__45"
+
+    // $ANTLR start "T__46"
+    public final void mT__46() throws RecognitionException {
+        try {
+            int _type = T__46;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:45:7: ( 'error' )
+            // InternalProblem.g:45:9: 'error'
+            {
+            match("error"); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__46"
+
+    // $ANTLR start "T__47"
+    public final void mT__47() throws RecognitionException {
+        try {
+            int _type = T__47;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:46:7: ( '+=' )
+            // InternalProblem.g:46:9: '+='
+            {
+            match("+="); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__47"
+
+    // $ANTLR start "RULE_ID"
+    public final void mRULE_ID() throws RecognitionException {
+        try {
+            int _type = RULE_ID;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:6069:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalProblem.g:6069:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            {
+            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
+                input.consume();
+
+            }
+            else {
+                MismatchedSetException mse = new MismatchedSetException(null,input);
+                recover(mse);
+                throw mse;}
+
+            // InternalProblem.g:6069:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            loop1:
+            do {
+                int alt1=2;
+                int LA1_0 = input.LA(1);
+
+                if ( ((LA1_0>='0' && LA1_0<='9')||(LA1_0>='A' && LA1_0<='Z')||LA1_0=='_'||(LA1_0>='a' && LA1_0<='z')) ) {
+                    alt1=1;
+                }
+
+
+                switch (alt1) {
+                case 1 :
+                    // InternalProblem.g:
+                    {
+                    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();
+
+                    }
+                    else {
+                        MismatchedSetException mse = new MismatchedSetException(null,input);
+                        recover(mse);
+                        throw mse;}
+
+
+                    }
+                    break;
+
+                default :
+                    break loop1;
+                }
+            } while (true);
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "RULE_ID"
+
     // $ANTLR start "RULE_STRING"
     public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5024:13: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
-            // InternalProblem.g:5024:15: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+            // InternalProblem.g:6071:13: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
+            // InternalProblem.g:6071:15: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
             {
             match('\"'); 
-            // InternalProblem.g:5024:19: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
-            loop1:
+            // InternalProblem.g:6071:19: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+            loop2:
             do {
-                int alt1=3;
-                int LA1_0 = input.LA(1);
+                int alt2=3;
+                int LA2_0 = input.LA(1);
 
-                if ( (LA1_0=='\\') ) {
-                    alt1=1;
+                if ( (LA2_0=='\\') ) {
+                    alt2=1;
                 }
-                else if ( ((LA1_0>='\u0000' && LA1_0<='!')||(LA1_0>='#' && LA1_0<='[')||(LA1_0>=']' && LA1_0<='\uFFFF')) ) {
-                    alt1=2;
+                else if ( ((LA2_0>='\u0000' && LA2_0<='!')||(LA2_0>='#' && LA2_0<='[')||(LA2_0>=']' && LA2_0<='\uFFFF')) ) {
+                    alt2=2;
                 }
 
 
-                switch (alt1) {
+                switch (alt2) {
                 case 1 :
-                    // InternalProblem.g:5024:20: '\\\\' .
+                    // InternalProblem.g:6071:20: '\\\\' .
                     {
                     match('\\'); 
                     matchAny(); 
@@ -779,7 +903,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:5024:27: ~ ( ( '\\\\' | '\"' ) )
+                    // InternalProblem.g:6071:27: ~ ( ( '\\\\' | '\"' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -795,7 +919,7 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop1;
+                    break loop2;
                 }
             } while (true);
 
@@ -816,27 +940,27 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_QUOTED_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5026:16: ( '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            // InternalProblem.g:5026:18: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+            // InternalProblem.g:6073:16: ( '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalProblem.g:6073:18: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
             {
             match('\''); 
-            // InternalProblem.g:5026:23: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
-            loop2:
+            // InternalProblem.g:6073:23: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+            loop3:
             do {
-                int alt2=3;
-                int LA2_0 = input.LA(1);
+                int alt3=3;
+                int LA3_0 = input.LA(1);
 
-                if ( (LA2_0=='\\') ) {
-                    alt2=1;
+                if ( (LA3_0=='\\') ) {
+                    alt3=1;
                 }
-                else if ( ((LA2_0>='\u0000' && LA2_0<='&')||(LA2_0>='(' && LA2_0<='[')||(LA2_0>=']' && LA2_0<='\uFFFF')) ) {
-                    alt2=2;
+                else if ( ((LA3_0>='\u0000' && LA3_0<='&')||(LA3_0>='(' && LA3_0<='[')||(LA3_0>=']' && LA3_0<='\uFFFF')) ) {
+                    alt3=2;
                 }
 
 
-                switch (alt2) {
+                switch (alt3) {
                 case 1 :
-                    // InternalProblem.g:5026:24: '\\\\' .
+                    // InternalProblem.g:6073:24: '\\\\' .
                     {
                     match('\\'); 
                     matchAny(); 
@@ -844,7 +968,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:5026:31: ~ ( ( '\\\\' | '\\'' ) )
+                    // InternalProblem.g:6073:31: ~ ( ( '\\\\' | '\\'' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -860,7 +984,7 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop2;
+                    break loop3;
                 }
             } while (true);
 
@@ -881,35 +1005,35 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5028:17: ( ( '%' | '//' ) (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalProblem.g:5028:19: ( '%' | '//' ) (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalProblem.g:6075:17: ( ( '%' | '//' ) (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalProblem.g:6075:19: ( '%' | '//' ) (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
-            // InternalProblem.g:5028:19: ( '%' | '//' )
-            int alt3=2;
-            int LA3_0 = input.LA(1);
+            // InternalProblem.g:6075:19: ( '%' | '//' )
+            int alt4=2;
+            int LA4_0 = input.LA(1);
 
-            if ( (LA3_0=='%') ) {
-                alt3=1;
+            if ( (LA4_0=='%') ) {
+                alt4=1;
             }
-            else if ( (LA3_0=='/') ) {
-                alt3=2;
+            else if ( (LA4_0=='/') ) {
+                alt4=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 3, 0, input);
+                    new NoViableAltException("", 4, 0, input);
 
                 throw nvae;
             }
-            switch (alt3) {
+            switch (alt4) {
                 case 1 :
-                    // InternalProblem.g:5028:20: '%'
+                    // InternalProblem.g:6075:20: '%'
                     {
                     match('%'); 
 
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:5028:24: '//'
+                    // InternalProblem.g:6075:24: '//'
                     {
                     match("//"); 
 
@@ -919,20 +1043,20 @@ public class InternalProblemLexer extends Lexer {
 
             }
 
-            // InternalProblem.g:5028:30: (~ ( ( '\\n' | '\\r' ) ) )*
-            loop4:
+            // InternalProblem.g:6075:30: (~ ( ( '\\n' | '\\r' ) ) )*
+            loop5:
             do {
-                int alt4=2;
-                int LA4_0 = input.LA(1);
+                int alt5=2;
+                int LA5_0 = input.LA(1);
 
-                if ( ((LA4_0>='\u0000' && LA4_0<='\t')||(LA4_0>='\u000B' && LA4_0<='\f')||(LA4_0>='\u000E' && LA4_0<='\uFFFF')) ) {
-                    alt4=1;
+                if ( ((LA5_0>='\u0000' && LA5_0<='\t')||(LA5_0>='\u000B' && LA5_0<='\f')||(LA5_0>='\u000E' && LA5_0<='\uFFFF')) ) {
+                    alt5=1;
                 }
 
 
-                switch (alt4) {
+                switch (alt5) {
                 case 1 :
-                    // InternalProblem.g:5028:30: ~ ( ( '\\n' | '\\r' ) )
+                    // InternalProblem.g:6075:30: ~ ( ( '\\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();
@@ -948,31 +1072,31 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop4;
+                    break loop5;
                 }
             } while (true);
 
-            // InternalProblem.g:5028:46: ( ( '\\r' )? '\\n' )?
-            int alt6=2;
-            int LA6_0 = input.LA(1);
+            // InternalProblem.g:6075:46: ( ( '\\r' )? '\\n' )?
+            int alt7=2;
+            int LA7_0 = input.LA(1);
 
-            if ( (LA6_0=='\n'||LA6_0=='\r') ) {
-                alt6=1;
+            if ( (LA7_0=='\n'||LA7_0=='\r') ) {
+                alt7=1;
             }
-            switch (alt6) {
+            switch (alt7) {
                 case 1 :
-                    // InternalProblem.g:5028:47: ( '\\r' )? '\\n'
+                    // InternalProblem.g:6075:47: ( '\\r' )? '\\n'
                     {
-                    // InternalProblem.g:5028:47: ( '\\r' )?
-                    int alt5=2;
-                    int LA5_0 = input.LA(1);
+                    // InternalProblem.g:6075:47: ( '\\r' )?
+                    int alt6=2;
+                    int LA6_0 = input.LA(1);
 
-                    if ( (LA5_0=='\r') ) {
-                        alt5=1;
+                    if ( (LA6_0=='\r') ) {
+                        alt6=1;
                     }
-                    switch (alt5) {
+                    switch (alt6) {
                         case 1 :
-                            // InternalProblem.g:5028:47: '\\r'
+                            // InternalProblem.g:6075:47: '\\r'
                             {
                             match('\r'); 
 
@@ -999,108 +1123,29 @@ public class InternalProblemLexer extends Lexer {
     }
     // $ANTLR end "RULE_SL_COMMENT"
 
-    // $ANTLR start "RULE_ID"
-    public final void mRULE_ID() throws RecognitionException {
+    // $ANTLR start "RULE_INT"
+    public final void mRULE_INT() throws RecognitionException {
         try {
-            int _type = RULE_ID;
+            int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5030:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // InternalProblem.g:5030:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalProblem.g:6077:10: ( ( '0' .. '9' )+ )
+            // InternalProblem.g:6077:12: ( '0' .. '9' )+
             {
-            // InternalProblem.g:5030:11: ( '^' )?
-            int alt7=2;
-            int LA7_0 = input.LA(1);
-
-            if ( (LA7_0=='^') ) {
-                alt7=1;
-            }
-            switch (alt7) {
-                case 1 :
-                    // InternalProblem.g:5030:11: '^'
-                    {
-                    match('^'); 
-
-                    }
-                    break;
-
-            }
-
-            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            // InternalProblem.g:5030:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalProblem.g:6077:12: ( '0' .. '9' )+
+            int cnt8=0;
             loop8:
             do {
                 int alt8=2;
                 int LA8_0 = input.LA(1);
 
-                if ( ((LA8_0>='0' && LA8_0<='9')||(LA8_0>='A' && LA8_0<='Z')||LA8_0=='_'||(LA8_0>='a' && LA8_0<='z')) ) {
+                if ( ((LA8_0>='0' && LA8_0<='9')) ) {
                     alt8=1;
                 }
 
 
                 switch (alt8) {
                 case 1 :
-                    // InternalProblem.g:
-                    {
-                    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();
-
-                    }
-                    else {
-                        MismatchedSetException mse = new MismatchedSetException(null,input);
-                        recover(mse);
-                        throw mse;}
-
-
-                    }
-                    break;
-
-                default :
-                    break loop8;
-                }
-            } while (true);
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_ID"
-
-    // $ANTLR start "RULE_INT"
-    public final void mRULE_INT() throws RecognitionException {
-        try {
-            int _type = RULE_INT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5032:10: ( ( '0' .. '9' )+ )
-            // InternalProblem.g:5032:12: ( '0' .. '9' )+
-            {
-            // InternalProblem.g:5032:12: ( '0' .. '9' )+
-            int cnt9=0;
-            loop9:
-            do {
-                int alt9=2;
-                int LA9_0 = input.LA(1);
-
-                if ( ((LA9_0>='0' && LA9_0<='9')) ) {
-                    alt9=1;
-                }
-
-
-                switch (alt9) {
-                case 1 :
-                    // InternalProblem.g:5032:13: '0' .. '9'
+                    // InternalProblem.g:6077:13: '0' .. '9'
                     {
                     matchRange('0','9'); 
 
@@ -1108,12 +1153,12 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    if ( cnt9 >= 1 ) break loop9;
+                    if ( cnt8 >= 1 ) break loop8;
                         EarlyExitException eee =
-                            new EarlyExitException(9, input);
+                            new EarlyExitException(8, input);
                         throw eee;
                 }
-                cnt9++;
+                cnt8++;
             } while (true);
 
 
@@ -1132,37 +1177,37 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5034:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalProblem.g:5034:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalProblem.g:6079:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalProblem.g:6079:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalProblem.g:5034:24: ( options {greedy=false; } : . )*
-            loop10:
+            // InternalProblem.g:6079:24: ( options {greedy=false; } : . )*
+            loop9:
             do {
-                int alt10=2;
-                int LA10_0 = input.LA(1);
+                int alt9=2;
+                int LA9_0 = input.LA(1);
 
-                if ( (LA10_0=='*') ) {
-                    int LA10_1 = input.LA(2);
+                if ( (LA9_0=='*') ) {
+                    int LA9_1 = input.LA(2);
 
-                    if ( (LA10_1=='/') ) {
-                        alt10=2;
+                    if ( (LA9_1=='/') ) {
+                        alt9=2;
                     }
-                    else if ( ((LA10_1>='\u0000' && LA10_1<='.')||(LA10_1>='0' && LA10_1<='\uFFFF')) ) {
-                        alt10=1;
+                    else if ( ((LA9_1>='\u0000' && LA9_1<='.')||(LA9_1>='0' && LA9_1<='\uFFFF')) ) {
+                        alt9=1;
                     }
 
 
                 }
-                else if ( ((LA10_0>='\u0000' && LA10_0<=')')||(LA10_0>='+' && LA10_0<='\uFFFF')) ) {
-                    alt10=1;
+                else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
+                    alt9=1;
                 }
 
 
-                switch (alt10) {
+                switch (alt9) {
                 case 1 :
-                    // InternalProblem.g:5034:52: .
+                    // InternalProblem.g:6079:52: .
                     {
                     matchAny(); 
 
@@ -1170,7 +1215,7 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop10;
+                    break loop9;
                 }
             } while (true);
 
@@ -1192,22 +1237,22 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5036:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalProblem.g:5036:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalProblem.g:6081:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalProblem.g:6081:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalProblem.g:5036:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            int cnt11=0;
-            loop11:
+            // InternalProblem.g:6081:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            int cnt10=0;
+            loop10:
             do {
-                int alt11=2;
-                int LA11_0 = input.LA(1);
+                int alt10=2;
+                int LA10_0 = input.LA(1);
 
-                if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {
-                    alt11=1;
+                if ( ((LA10_0>='\t' && LA10_0<='\n')||LA10_0=='\r'||LA10_0==' ') ) {
+                    alt10=1;
                 }
 
 
-                switch (alt11) {
+                switch (alt10) {
                 case 1 :
                     // InternalProblem.g:
                     {
@@ -1225,12 +1270,12 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    if ( cnt11 >= 1 ) break loop11;
+                    if ( cnt10 >= 1 ) break loop10;
                         EarlyExitException eee =
-                            new EarlyExitException(11, input);
+                            new EarlyExitException(10, input);
                         throw eee;
                 }
-                cnt11++;
+                cnt10++;
             } while (true);
 
 
@@ -1249,8 +1294,8 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5038:16: ( . )
-            // InternalProblem.g:5038:18: .
+            // InternalProblem.g:6083:16: ( . )
+            // InternalProblem.g:6083:18: .
             {
             matchAny(); 
 
@@ -1265,10 +1310,10 @@ public class InternalProblemLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // InternalProblem.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | RULE_STRING | RULE_QUOTED_ID | RULE_SL_COMMENT | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt12=41;
-        alt12 = dfa12.predict(input);
-        switch (alt12) {
+        // InternalProblem.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | RULE_ID | RULE_STRING | RULE_QUOTED_ID | RULE_SL_COMMENT | RULE_INT | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt11=44;
+        alt11 = dfa11.predict(input);
+        switch (alt11) {
             case 1 :
                 // InternalProblem.g:1:10: T__12
                 {
@@ -1501,56 +1546,77 @@ public class InternalProblemLexer extends Lexer {
                 }
                 break;
             case 34 :
-                // InternalProblem.g:1:208: RULE_STRING
+                // InternalProblem.g:1:208: T__45
                 {
-                mRULE_STRING(); 
+                mT__45(); 
 
                 }
                 break;
             case 35 :
-                // InternalProblem.g:1:220: RULE_QUOTED_ID
+                // InternalProblem.g:1:214: T__46
                 {
-                mRULE_QUOTED_ID(); 
+                mT__46(); 
 
                 }
                 break;
             case 36 :
-                // InternalProblem.g:1:235: RULE_SL_COMMENT
+                // InternalProblem.g:1:220: T__47
                 {
-                mRULE_SL_COMMENT(); 
+                mT__47(); 
 
                 }
                 break;
             case 37 :
-                // InternalProblem.g:1:251: RULE_ID
+                // InternalProblem.g:1:226: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 38 :
-                // InternalProblem.g:1:259: RULE_INT
+                // InternalProblem.g:1:234: RULE_STRING
                 {
-                mRULE_INT(); 
+                mRULE_STRING(); 
 
                 }
                 break;
             case 39 :
-                // InternalProblem.g:1:268: RULE_ML_COMMENT
+                // InternalProblem.g:1:246: RULE_QUOTED_ID
                 {
-                mRULE_ML_COMMENT(); 
+                mRULE_QUOTED_ID(); 
 
                 }
                 break;
             case 40 :
-                // InternalProblem.g:1:284: RULE_WS
+                // InternalProblem.g:1:261: RULE_SL_COMMENT
                 {
-                mRULE_WS(); 
+                mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 41 :
-                // InternalProblem.g:1:292: RULE_ANY_OTHER
+                // InternalProblem.g:1:277: RULE_INT
+                {
+                mRULE_INT(); 
+
+                }
+                break;
+            case 42 :
+                // InternalProblem.g:1:286: RULE_ML_COMMENT
+                {
+                mRULE_ML_COMMENT(); 
+
+                }
+                break;
+            case 43 :
+                // InternalProblem.g:1:302: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 44 :
+                // InternalProblem.g:1:310: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1562,78 +1628,69 @@ public class InternalProblemLexer extends Lexer {
     }
 
 
-    protected DFA12 dfa12 = new DFA12(this);
-    static final String DFA12_eotS =
-        "\1\uffff\1\44\2\uffff\2\50\2\uffff\3\50\2\uffff\2\50\4\uffff\1\50\2\uffff\1\77\2\50\1\103\2\42\1\uffff\2\42\10\uffff\1\50\1\uffff\1\50\2\uffff\3\50\2\uffff\5\50\4\uffff\1\50\5\uffff\2\50\10\uffff\17\50\1\147\1\50\1\151\5\50\1\157\5\50\1\uffff\1\50\1\uffff\1\166\1\50\1\170\2\50\1\uffff\1\173\1\50\1\175\1\50\1\177\1\50\1\uffff\1\50\1\uffff\2\50\1\uffff\1\50\1\uffff\1\50\1\uffff\1\u0086\1\u0087\1\50\1\u0089\2\50\2\uffff\1\u008c\1\uffff\1\u008d\1\u008e\3\uffff";
-    static final String DFA12_eofS =
-        "\u008f\uffff";
-    static final String DFA12_minS =
-        "\1\0\1\56\2\uffff\1\145\1\162\2\uffff\1\162\1\141\1\156\2\uffff\1\154\1\156\4\uffff\1\160\2\uffff\1\55\1\143\1\142\1\75\2\0\1\uffff\1\52\1\101\10\uffff\1\146\1\uffff\1\145\2\uffff\1\165\1\154\1\153\2\uffff\1\141\1\156\1\164\1\165\1\162\4\uffff\1\160\5\uffff\1\157\1\163\10\uffff\1\145\1\144\1\142\1\145\1\163\1\156\1\163\1\164\1\145\1\155\2\157\1\160\1\164\1\162\1\60\1\154\1\60\1\145\1\157\1\163\1\141\1\156\1\60\1\162\1\163\1\145\1\162\1\163\1\uffff\1\145\1\uffff\1\60\1\167\1\60\1\151\1\144\1\uffff\1\60\1\151\1\60\1\141\1\60\1\155\1\uffff\1\156\1\uffff\1\156\1\163\1\uffff\1\164\1\uffff\1\143\1\uffff\2\60\1\163\1\60\1\145\1\164\2\uffff\1\60\1\uffff\2\60\3\uffff";
-    static final String DFA12_maxS =
-        "\1\uffff\1\56\2\uffff\1\145\1\162\2\uffff\1\162\1\141\1\156\2\uffff\1\157\1\170\4\uffff\1\160\2\uffff\1\72\1\143\1\142\1\75\2\uffff\1\uffff\1\57\1\172\10\uffff\1\146\1\uffff\1\157\2\uffff\1\165\1\154\1\153\2\uffff\1\141\1\156\1\164\1\165\1\162\4\uffff\1\160\5\uffff\1\157\1\163\10\uffff\1\145\1\144\1\142\1\145\1\163\1\156\1\163\1\164\1\145\1\155\2\157\1\160\1\164\1\162\1\172\1\154\1\172\1\145\1\157\1\163\1\141\1\156\1\172\1\162\1\163\1\145\1\162\1\163\1\uffff\1\145\1\uffff\1\172\1\167\1\172\1\151\1\144\1\uffff\1\172\1\151\1\172\1\141\1\172\1\155\1\uffff\1\156\1\uffff\1\156\1\163\1\uffff\1\164\1\uffff\1\143\1\uffff\2\172\1\163\1\172\1\145\1\164\2\uffff\1\172\1\uffff\2\172\3\uffff";
-    static final String DFA12_acceptS =
-        "\2\uffff\1\2\1\3\2\uffff\1\6\1\7\3\uffff\1\13\1\14\2\uffff\1\20\1\21\1\23\1\24\1\uffff\1\26\1\27\6\uffff\1\44\2\uffff\1\45\1\46\1\50\1\51\1\33\1\1\1\2\1\3\1\uffff\1\45\1\uffff\1\6\1\7\3\uffff\1\13\1\14\5\uffff\1\20\1\21\1\23\1\24\1\uffff\1\26\1\27\1\30\1\34\1\31\2\uffff\1\41\1\40\1\42\1\43\1\44\1\47\1\46\1\50\35\uffff\1\5\1\uffff\1\10\5\uffff\1\22\6\uffff\1\11\1\uffff\1\16\2\uffff\1\37\1\uffff\1\32\1\uffff\1\4\6\uffff\1\15\1\12\1\uffff\1\17\2\uffff\1\36\1\25\1\35";
-    static final String DFA12_specialS =
-        "\1\0\31\uffff\1\2\1\1\163\uffff}>";
-    static final String[] DFA12_transitionS = {
-            "\11\42\2\41\2\42\1\41\22\42\1\41\1\13\1\32\2\42\1\34\1\42\1\33\1\24\1\25\1\7\1\31\1\2\1\42\1\1\1\35\12\40\1\26\1\3\1\42\1\6\1\42\1\14\1\42\32\37\1\21\1\42\1\22\1\36\1\37\1\42\1\30\1\37\1\15\1\37\1\16\1\11\10\37\1\23\1\5\1\37\1\4\1\27\1\10\1\12\5\37\1\17\1\42\1\20\uff82\42",
-            "\1\43",
+    protected DFA11 dfa11 = new DFA11(this);
+    static final String DFA11_eotS =
+        "\1\uffff\1\45\2\uffff\2\51\2\uffff\2\51\1\62\1\63\1\uffff\1\66\1\51\2\uffff\1\51\4\uffff\1\51\2\uffff\1\105\2\51\1\uffff\2\43\1\uffff\1\43\7\uffff\1\51\1\uffff\1\51\2\uffff\5\51\5\uffff\1\51\2\uffff\2\51\4\uffff\1\51\5\uffff\2\51\6\uffff\17\51\1\153\1\51\1\155\2\51\1\160\10\51\1\uffff\1\51\1\uffff\1\172\1\51\1\uffff\1\174\1\51\1\176\2\51\1\u0081\1\51\1\u0083\1\51\1\uffff\1\51\1\uffff\1\51\1\uffff\2\51\1\uffff\1\51\1\uffff\1\u008a\1\u008b\1\u008c\3\51\3\uffff\1\u0090\1\u0091\1\u0092\3\uffff";
+    static final String DFA11_eofS =
+        "\u0093\uffff";
+    static final String DFA11_minS =
+        "\1\0\1\56\2\uffff\1\145\1\162\2\uffff\1\162\1\141\2\60\1\uffff\1\75\1\156\2\uffff\1\154\4\uffff\1\160\2\uffff\1\55\1\143\1\142\1\uffff\2\0\1\uffff\1\52\7\uffff\1\146\1\uffff\1\145\2\uffff\1\165\1\154\1\164\1\165\1\162\5\uffff\1\153\2\uffff\1\141\1\156\4\uffff\1\160\5\uffff\1\157\1\163\6\uffff\1\145\1\144\1\142\1\145\1\163\1\145\1\155\1\157\1\156\1\163\1\164\1\157\1\160\1\164\1\162\1\60\1\154\1\60\1\145\1\156\1\60\1\162\1\157\1\163\1\141\1\163\1\145\1\162\1\163\1\uffff\1\145\1\uffff\1\60\1\144\1\uffff\1\60\1\167\1\60\2\151\1\60\1\141\1\60\1\155\1\uffff\1\163\1\uffff\1\156\1\uffff\1\156\1\164\1\uffff\1\143\1\uffff\3\60\1\163\1\145\1\164\3\uffff\3\60\3\uffff";
+    static final String DFA11_maxS =
+        "\1\uffff\1\56\2\uffff\1\145\1\162\2\uffff\1\162\1\141\2\172\1\uffff\1\75\1\156\2\uffff\1\157\4\uffff\1\160\2\uffff\1\72\1\143\1\142\1\uffff\2\uffff\1\uffff\1\57\7\uffff\1\146\1\uffff\1\157\2\uffff\1\165\1\154\1\164\1\165\1\162\5\uffff\1\153\2\uffff\1\141\1\156\4\uffff\1\160\5\uffff\1\157\1\163\6\uffff\1\145\1\144\1\142\1\145\1\163\1\145\1\155\1\157\1\156\1\163\1\164\1\157\1\160\1\164\1\162\1\172\1\154\1\172\1\145\1\156\1\172\1\162\1\157\1\163\1\141\1\163\1\145\1\162\1\163\1\uffff\1\145\1\uffff\1\172\1\144\1\uffff\1\172\1\167\1\172\2\151\1\172\1\141\1\172\1\155\1\uffff\1\163\1\uffff\1\156\1\uffff\1\156\1\164\1\uffff\1\143\1\uffff\3\172\1\163\1\145\1\164\3\uffff\3\172\3\uffff";
+    static final String DFA11_acceptS =
+        "\2\uffff\1\2\1\3\2\uffff\1\6\1\7\4\uffff\1\14\2\uffff\1\17\1\20\1\uffff\1\24\1\25\1\27\1\30\1\uffff\1\32\1\33\3\uffff\1\45\2\uffff\1\50\1\uffff\1\51\1\53\1\54\1\37\1\1\1\2\1\3\1\uffff\1\45\1\uffff\1\6\1\7\5\uffff\1\12\1\13\1\14\1\44\1\15\1\uffff\1\17\1\20\2\uffff\1\24\1\25\1\27\1\30\1\uffff\1\32\1\33\1\34\1\40\1\35\2\uffff\1\46\1\47\1\50\1\52\1\51\1\53\35\uffff\1\5\1\uffff\1\10\2\uffff\1\26\11\uffff\1\11\1\uffff\1\43\1\uffff\1\22\2\uffff\1\36\1\uffff\1\4\6\uffff\1\21\1\23\1\16\3\uffff\1\42\1\31\1\41";
+    static final String DFA11_specialS =
+        "\1\1\34\uffff\1\2\1\0\164\uffff}>";
+    static final String[] DFA11_transitionS = {
+            "\11\43\2\42\2\43\1\42\22\43\1\42\1\17\1\35\2\43\1\37\1\43\1\36\1\27\1\30\1\7\1\15\1\2\1\14\1\1\1\40\12\41\1\31\1\3\1\43\1\6\1\43\1\20\1\43\4\34\1\13\25\34\1\24\1\43\1\25\1\43\1\34\1\43\1\33\1\34\1\21\1\34\1\12\1\11\10\34\1\26\1\5\1\34\1\4\1\32\1\10\1\16\5\34\1\22\1\43\1\23\uff82\43",
+            "\1\44",
             "",
             "",
-            "\1\47",
-            "\1\51",
+            "\1\50",
+            "\1\52",
             "",
             "",
-            "\1\54",
             "\1\55",
             "\1\56",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\15\51\1\60\3\51\1\61\5\51\1\57\2\51",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
             "",
+            "\1\65",
+            "\1\67",
             "",
-            "\1\61\2\uffff\1\62",
-            "\1\64\3\uffff\1\65\5\uffff\1\63",
             "",
+            "\1\72\2\uffff\1\73",
             "",
             "",
             "",
-            "\1\72",
             "",
-            "",
-            "\1\75\14\uffff\1\76",
             "\1\100",
-            "\1\101",
-            "\1\102",
-            "\0\104",
-            "\0\105",
-            "",
-            "\1\107\4\uffff\1\106",
-            "\32\50\4\uffff\1\50\1\uffff\32\50",
             "",
             "",
+            "\1\103\14\uffff\1\104",
+            "\1\106",
+            "\1\107",
             "",
+            "\0\110",
+            "\0\111",
             "",
+            "\1\113\4\uffff\1\112",
             "",
             "",
             "",
             "",
-            "\1\112",
             "",
-            "\1\113\11\uffff\1\114",
             "",
             "",
-            "\1\115",
             "\1\116",
-            "\1\117",
+            "",
+            "\1\117\11\uffff\1\120",
             "",
             "",
-            "\1\120",
             "\1\121",
             "\1\122",
             "\1\123",
             "\1\124",
-            "",
-            "",
-            "",
-            "",
             "\1\125",
             "",
             "",
@@ -1641,19 +1698,28 @@ public class InternalProblemLexer extends Lexer {
             "",
             "",
             "\1\126",
+            "",
+            "",
             "\1\127",
+            "\1\130",
             "",
             "",
             "",
             "",
+            "\1\131",
+            "",
             "",
             "",
             "",
             "",
-            "\1\130",
-            "\1\131",
             "\1\132",
             "\1\133",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
             "\1\134",
             "\1\135",
             "\1\136",
@@ -1665,195 +1731,201 @@ public class InternalProblemLexer extends Lexer {
             "\1\144",
             "\1\145",
             "\1\146",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+            "\1\147",
             "\1\150",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+            "\1\151",
             "\1\152",
-            "\1\153",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
             "\1\154",
-            "\1\155",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
             "\1\156",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\1\160",
+            "\1\157",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
             "\1\161",
             "\1\162",
             "\1\163",
             "\1\164",
-            "",
             "\1\165",
-            "",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+            "\1\166",
             "\1\167",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\1\171",
-            "\1\172",
+            "\1\170",
             "",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\1\174",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\1\176",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\1\u0080",
+            "\1\171",
             "",
-            "\1\u0081",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\1\173",
             "",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\1\175",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\1\177",
+            "\1\u0080",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
             "\1\u0082",
-            "\1\u0083",
-            "",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
             "\1\u0084",
             "",
             "\1\u0085",
             "",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+            "\1\u0086",
+            "",
+            "\1\u0087",
             "\1\u0088",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\1\u008a",
-            "\1\u008b",
             "",
+            "\1\u0089",
+            "",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\1\u008d",
+            "\1\u008e",
+            "\1\u008f",
             "",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
             "",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+            "",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
             "",
             "",
             ""
     };
 
-    static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
-    static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
-    static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
-    static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
-    static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
-    static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
-    static final short[][] DFA12_transition;
+    static final short[] DFA11_eot = DFA.unpackEncodedString(DFA11_eotS);
+    static final short[] DFA11_eof = DFA.unpackEncodedString(DFA11_eofS);
+    static final char[] DFA11_min = DFA.unpackEncodedStringToUnsignedChars(DFA11_minS);
+    static final char[] DFA11_max = DFA.unpackEncodedStringToUnsignedChars(DFA11_maxS);
+    static final short[] DFA11_accept = DFA.unpackEncodedString(DFA11_acceptS);
+    static final short[] DFA11_special = DFA.unpackEncodedString(DFA11_specialS);
+    static final short[][] DFA11_transition;
 
     static {
-        int numStates = DFA12_transitionS.length;
-        DFA12_transition = new short[numStates][];
+        int numStates = DFA11_transitionS.length;
+        DFA11_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
+            DFA11_transition[i] = DFA.unpackEncodedString(DFA11_transitionS[i]);
         }
     }
 
-    class DFA12 extends DFA {
+    class DFA11 extends DFA {
 
-        public DFA12(BaseRecognizer recognizer) {
+        public DFA11(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 12;
-            this.eot = DFA12_eot;
-            this.eof = DFA12_eof;
-            this.min = DFA12_min;
-            this.max = DFA12_max;
-            this.accept = DFA12_accept;
-            this.special = DFA12_special;
-            this.transition = DFA12_transition;
+            this.decisionNumber = 11;
+            this.eot = DFA11_eot;
+            this.eof = DFA11_eof;
+            this.min = DFA11_min;
+            this.max = DFA11_max;
+            this.accept = DFA11_accept;
+            this.special = DFA11_special;
+            this.transition = DFA11_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | RULE_STRING | RULE_QUOTED_ID | RULE_SL_COMMENT | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | RULE_ID | RULE_STRING | RULE_QUOTED_ID | RULE_SL_COMMENT | RULE_INT | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             IntStream input = _input;
                 int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA12_0 = input.LA(1);
+                        int LA11_30 = input.LA(1);
 
                         s = -1;
-                        if ( (LA12_0=='.') ) {s = 1;}
+                        if ( ((LA11_30>='\u0000' && LA11_30<='\uFFFF')) ) {s = 73;}
+
+                        else s = 35;
 
-                        else if ( (LA12_0==',') ) {s = 2;}
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA11_0 = input.LA(1);
 
-                        else if ( (LA12_0==';') ) {s = 3;}
+                        s = -1;
+                        if ( (LA11_0=='.') ) {s = 1;}
 
-                        else if ( (LA12_0=='r') ) {s = 4;}
+                        else if ( (LA11_0==',') ) {s = 2;}
 
-                        else if ( (LA12_0=='p') ) {s = 5;}
+                        else if ( (LA11_0==';') ) {s = 3;}
 
-                        else if ( (LA12_0=='=') ) {s = 6;}
+                        else if ( (LA11_0=='r') ) {s = 4;}
 
-                        else if ( (LA12_0=='*') ) {s = 7;}
+                        else if ( (LA11_0=='p') ) {s = 5;}
 
-                        else if ( (LA12_0=='t') ) {s = 8;}
+                        else if ( (LA11_0=='=') ) {s = 6;}
 
-                        else if ( (LA12_0=='f') ) {s = 9;}
+                        else if ( (LA11_0=='*') ) {s = 7;}
 
-                        else if ( (LA12_0=='u') ) {s = 10;}
+                        else if ( (LA11_0=='t') ) {s = 8;}
 
-                        else if ( (LA12_0=='!') ) {s = 11;}
+                        else if ( (LA11_0=='f') ) {s = 9;}
 
-                        else if ( (LA12_0=='?') ) {s = 12;}
+                        else if ( (LA11_0=='e') ) {s = 10;}
 
-                        else if ( (LA12_0=='c') ) {s = 13;}
+                        else if ( (LA11_0=='E') ) {s = 11;}
 
-                        else if ( (LA12_0=='e') ) {s = 14;}
+                        else if ( (LA11_0=='-') ) {s = 12;}
 
-                        else if ( (LA12_0=='{') ) {s = 15;}
+                        else if ( (LA11_0=='+') ) {s = 13;}
 
-                        else if ( (LA12_0=='}') ) {s = 16;}
+                        else if ( (LA11_0=='u') ) {s = 14;}
 
-                        else if ( (LA12_0=='[') ) {s = 17;}
+                        else if ( (LA11_0=='!') ) {s = 15;}
 
-                        else if ( (LA12_0==']') ) {s = 18;}
+                        else if ( (LA11_0=='?') ) {s = 16;}
 
-                        else if ( (LA12_0=='o') ) {s = 19;}
+                        else if ( (LA11_0=='c') ) {s = 17;}
 
-                        else if ( (LA12_0=='(') ) {s = 20;}
+                        else if ( (LA11_0=='{') ) {s = 18;}
 
-                        else if ( (LA12_0==')') ) {s = 21;}
+                        else if ( (LA11_0=='}') ) {s = 19;}
 
-                        else if ( (LA12_0==':') ) {s = 22;}
+                        else if ( (LA11_0=='[') ) {s = 20;}
 
-                        else if ( (LA12_0=='s') ) {s = 23;}
+                        else if ( (LA11_0==']') ) {s = 21;}
 
-                        else if ( (LA12_0=='a') ) {s = 24;}
+                        else if ( (LA11_0=='o') ) {s = 22;}
 
-                        else if ( (LA12_0=='+') ) {s = 25;}
+                        else if ( (LA11_0=='(') ) {s = 23;}
 
-                        else if ( (LA12_0=='\"') ) {s = 26;}
+                        else if ( (LA11_0==')') ) {s = 24;}
 
-                        else if ( (LA12_0=='\'') ) {s = 27;}
+                        else if ( (LA11_0==':') ) {s = 25;}
 
-                        else if ( (LA12_0=='%') ) {s = 28;}
+                        else if ( (LA11_0=='s') ) {s = 26;}
 
-                        else if ( (LA12_0=='/') ) {s = 29;}
+                        else if ( (LA11_0=='a') ) {s = 27;}
 
-                        else if ( (LA12_0=='^') ) {s = 30;}
+                        else if ( ((LA11_0>='A' && LA11_0<='D')||(LA11_0>='F' && LA11_0<='Z')||LA11_0=='_'||LA11_0=='b'||LA11_0=='d'||(LA11_0>='g' && LA11_0<='n')||LA11_0=='q'||(LA11_0>='v' && LA11_0<='z')) ) {s = 28;}
 
-                        else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='b'||LA12_0=='d'||(LA12_0>='g' && LA12_0<='n')||LA12_0=='q'||(LA12_0>='v' && LA12_0<='z')) ) {s = 31;}
+                        else if ( (LA11_0=='\"') ) {s = 29;}
 
-                        else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 32;}
+                        else if ( (LA11_0=='\'') ) {s = 30;}
 
-                        else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 33;}
+                        else if ( (LA11_0=='%') ) {s = 31;}
 
-                        else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||(LA12_0>='#' && LA12_0<='$')||LA12_0=='&'||LA12_0=='-'||LA12_0=='<'||LA12_0=='>'||LA12_0=='@'||LA12_0=='\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFF')) ) {s = 34;}
+                        else if ( (LA11_0=='/') ) {s = 32;}
 
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA12_27 = input.LA(1);
+                        else if ( ((LA11_0>='0' && LA11_0<='9')) ) {s = 33;}
 
-                        s = -1;
-                        if ( ((LA12_27>='\u0000' && LA12_27<='\uFFFF')) ) {s = 69;}
+                        else if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {s = 34;}
 
-                        else s = 34;
+                        else if ( ((LA11_0>='\u0000' && LA11_0<='\b')||(LA11_0>='\u000B' && LA11_0<='\f')||(LA11_0>='\u000E' && LA11_0<='\u001F')||(LA11_0>='#' && LA11_0<='$')||LA11_0=='&'||LA11_0=='<'||LA11_0=='>'||LA11_0=='@'||LA11_0=='\\'||LA11_0=='^'||LA11_0=='`'||LA11_0=='|'||(LA11_0>='~' && LA11_0<='\uFFFF')) ) {s = 35;}
 
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA12_26 = input.LA(1);
+                        int LA11_29 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA12_26>='\u0000' && LA12_26<='\uFFFF')) ) {s = 68;}
+                        if ( ((LA11_29>='\u0000' && LA11_29<='\uFFFF')) ) {s = 72;}
 
-                        else s = 34;
+                        else s = 35;
 
                         if ( s>=0 ) return s;
                         break;
             }
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 12, _s, input);
+                new NoViableAltException(getDescription(), 11, _s, input);
             error(nvae);
             throw nvae;
         }