Add enum support

1 files changed, 296 insertions, 263 deletions

diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
index a180de53..e8f6f12d 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
@@ -12,31 +12,16 @@ import java.util.ArrayList;
 
 @SuppressWarnings("all")
 public class InternalProblemLexer extends Lexer {
-    public static final int RULE_STRING=7;
-    public static final int RULE_SL_COMMENT=9;
     public static final int T__19=19;
     public static final int T__15=15;
-    public static final int T__37=37;
     public static final int T__16=16;
-    public static final int T__38=38;
     public static final int T__17=17;
-    public static final int T__39=39;
     public static final int T__18=18;
-    public static final int T__33=33;
     public static final int T__12=12;
-    public static final int T__34=34;
     public static final int T__13=13;
-    public static final int T__35=35;
     public static final int T__14=14;
-    public static final int T__36=36;
-    public static final int EOF=-1;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
     public static final int RULE_ID=6;
-    public static final int RULE_WS=10;
     public static final int RULE_QUOTED_ID=5;
-    public static final int RULE_ANY_OTHER=11;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
@@ -47,11 +32,27 @@ public class InternalProblemLexer extends Lexer {
     public static final int T__23=23;
     public static final int T__24=24;
     public static final int T__25=25;
+    public static final int T__20=20;
+    public static final int T__21=21;
+    public static final int RULE_STRING=7;
+    public static final int RULE_SL_COMMENT=9;
+    public static final int T__37=37;
+    public static final int T__38=38;
+    public static final int T__39=39;
+    public static final int T__33=33;
+    public static final int T__34=34;
+    public static final int T__35=35;
+    public static final int T__36=36;
+    public static final int EOF=-1;
+    public static final int T__30=30;
+    public static final int T__31=31;
+    public static final int T__32=32;
+    public static final int RULE_WS=10;
+    public static final int RULE_ANY_OTHER=11;
     public static final int T__40=40;
     public static final int T__41=41;
-    public static final int T__20=20;
     public static final int T__42=42;
-    public static final int T__21=21;
+    public static final int T__43=43;
 
     // delegates
     // delegators
@@ -91,11 +92,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:12:7: ( 'refers' )
-            // InternalProblem.g:12:9: 'refers'
+            // InternalProblem.g:12:7: ( ',' )
+            // InternalProblem.g:12:9: ','
             {
-            match("refers"); 
-
+            match(','); 
 
             }
 
@@ -112,11 +112,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:13:7: ( 'pred' )
-            // InternalProblem.g:13:9: 'pred'
+            // InternalProblem.g:13:7: ( ';' )
+            // InternalProblem.g:13:9: ';'
             {
-            match("pred"); 
-
+            match(';'); 
 
             }
 
@@ -133,10 +132,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:14:7: ( '=' )
-            // InternalProblem.g:14:9: '='
+            // InternalProblem.g:14:7: ( 'refers' )
+            // InternalProblem.g:14:9: 'refers'
             {
-            match('='); 
+            match("refers"); 
+
 
             }
 
@@ -153,10 +153,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:15:7: ( '*' )
-            // InternalProblem.g:15:9: '*'
+            // InternalProblem.g:15:7: ( 'pred' )
+            // InternalProblem.g:15:9: 'pred'
             {
-            match('*'); 
+            match("pred"); 
+
 
             }
 
@@ -173,11 +174,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:16:7: ( 'true' )
-            // InternalProblem.g:16:9: 'true'
+            // InternalProblem.g:16:7: ( '=' )
+            // InternalProblem.g:16:9: '='
             {
-            match("true"); 
-
+            match('='); 
 
             }
 
@@ -194,11 +194,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:17:7: ( 'false' )
-            // InternalProblem.g:17:9: 'false'
+            // InternalProblem.g:17:7: ( '*' )
+            // InternalProblem.g:17:9: '*'
             {
-            match("false"); 
-
+            match('*'); 
 
             }
 
@@ -215,10 +214,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:18:7: ( 'unknown' )
-            // InternalProblem.g:18:9: 'unknown'
+            // InternalProblem.g:18:7: ( 'true' )
+            // InternalProblem.g:18:9: 'true'
             {
-            match("unknown"); 
+            match("true"); 
 
 
             }
@@ -236,10 +235,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:19:7: ( '!' )
-            // InternalProblem.g:19:9: '!'
+            // InternalProblem.g:19:7: ( 'false' )
+            // InternalProblem.g:19:9: 'false'
             {
-            match('!'); 
+            match("false"); 
+
 
             }
 
@@ -256,10 +256,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:20:7: ( '?' )
-            // InternalProblem.g:20:9: '?'
+            // InternalProblem.g:20:7: ( 'unknown' )
+            // InternalProblem.g:20:9: 'unknown'
             {
-            match('?'); 
+            match("unknown"); 
+
 
             }
 
@@ -276,11 +277,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:21:7: ( 'problem' )
-            // InternalProblem.g:21:9: 'problem'
+            // InternalProblem.g:21:7: ( '!' )
+            // InternalProblem.g:21:9: '!'
             {
-            match("problem"); 
-
+            match('!'); 
 
             }
 
@@ -297,11 +297,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:22:7: ( 'class' )
-            // InternalProblem.g:22:9: 'class'
+            // InternalProblem.g:22:7: ( '?' )
+            // InternalProblem.g:22:9: '?'
             {
-            match("class"); 
-
+            match('?'); 
 
             }
 
@@ -318,10 +317,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:23:7: ( 'extends' )
-            // InternalProblem.g:23:9: 'extends'
+            // InternalProblem.g:23:7: ( 'problem' )
+            // InternalProblem.g:23:9: 'problem'
             {
-            match("extends"); 
+            match("problem"); 
 
 
             }
@@ -339,10 +338,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:24:7: ( ',' )
-            // InternalProblem.g:24:9: ','
+            // InternalProblem.g:24:7: ( 'class' )
+            // InternalProblem.g:24:9: 'class'
             {
-            match(','); 
+            match("class"); 
+
 
             }
 
@@ -359,10 +359,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:25:7: ( '{' )
-            // InternalProblem.g:25:9: '{'
+            // InternalProblem.g:25:7: ( 'extends' )
+            // InternalProblem.g:25:9: 'extends'
             {
-            match('{'); 
+            match("extends"); 
+
 
             }
 
@@ -379,10 +380,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('{'); 
 
             }
 
@@ -399,10 +400,10 @@ 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: ( '}' )
+            // InternalProblem.g:27:9: '}'
             {
-            match(';'); 
+            match('}'); 
 
             }
 
@@ -419,10 +420,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:28:7: ( '[' )
-            // InternalProblem.g:28:9: '['
+            // InternalProblem.g:28:7: ( 'enum' )
+            // InternalProblem.g:28:9: 'enum'
             {
-            match('['); 
+            match("enum"); 
+
 
             }
 
@@ -439,10 +441,10 @@ 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: ( '[' )
+            // InternalProblem.g:29:9: '['
             {
-            match(']'); 
+            match('['); 
 
             }
 
@@ -459,11 +461,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:30:7: ( 'opposite' )
-            // InternalProblem.g:30:9: 'opposite'
+            // InternalProblem.g:30:7: ( ']' )
+            // InternalProblem.g:30:9: ']'
             {
-            match("opposite"); 
-
+            match(']'); 
 
             }
 
@@ -480,10 +481,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:31:7: ( '(' )
-            // InternalProblem.g:31:9: '('
+            // InternalProblem.g:31:7: ( 'opposite' )
+            // InternalProblem.g:31:9: 'opposite'
             {
-            match('('); 
+            match("opposite"); 
+
 
             }
 
@@ -500,10 +502,10 @@ 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: ( '(' )
+            // InternalProblem.g:32:9: '('
             {
-            match(')'); 
+            match('('); 
 
             }
 
@@ -520,11 +522,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(')'); 
 
             }
 
@@ -541,10 +542,11 @@ 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(":-"); 
+
 
             }
 
@@ -561,11 +563,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:35:7: ( 'scope' )
-            // InternalProblem.g:35:9: 'scope'
+            // InternalProblem.g:35:7: ( ':' )
+            // InternalProblem.g:35:9: ':'
             {
-            match("scope"); 
-
+            match(':'); 
 
             }
 
@@ -582,10 +583,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:36:7: ( '..' )
-            // InternalProblem.g:36:9: '..'
+            // InternalProblem.g:36:7: ( 'scope' )
+            // InternalProblem.g:36:9: 'scope'
             {
-            match(".."); 
+            match("scope"); 
 
 
             }
@@ -603,10 +604,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:37:7: ( 'abstract' )
-            // InternalProblem.g:37:9: 'abstract'
+            // InternalProblem.g:37:7: ( '..' )
+            // InternalProblem.g:37:9: '..'
             {
-            match("abstract"); 
+            match(".."); 
 
 
             }
@@ -624,10 +625,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:38:7: ( 'contains' )
-            // InternalProblem.g:38:9: 'contains'
+            // InternalProblem.g:38:7: ( 'abstract' )
+            // InternalProblem.g:38:9: 'abstract'
             {
-            match("contains"); 
+            match("abstract"); 
 
 
             }
@@ -645,10 +646,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:39:7: ( 'error' )
-            // InternalProblem.g:39:9: 'error'
+            // InternalProblem.g:39:7: ( 'contains' )
+            // InternalProblem.g:39:9: 'contains'
             {
-            match("error"); 
+            match("contains"); 
 
 
             }
@@ -666,10 +667,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:40:7: ( '+' )
-            // InternalProblem.g:40:9: '+'
+            // InternalProblem.g:40:7: ( 'error' )
+            // InternalProblem.g:40:9: 'error'
             {
-            match('+'); 
+            match("error"); 
+
 
             }
 
@@ -686,8 +688,28 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:41:7: ( '+=' )
-            // InternalProblem.g:41:9: '+='
+            // InternalProblem.g:41:7: ( '+' )
+            // InternalProblem.g:41:9: '+'
+            {
+            match('+'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__42"
+
+    // $ANTLR start "T__43"
+    public final void mT__43() throws RecognitionException {
+        try {
+            int _type = T__43;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:42:7: ( '+=' )
+            // InternalProblem.g:42:9: '+='
             {
             match("+="); 
 
@@ -700,18 +722,18 @@ public class InternalProblemLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "T__42"
+    // $ANTLR end "T__43"
 
     // $ANTLR start "RULE_STRING"
     public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4471:13: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
-            // InternalProblem.g:4471:15: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+            // InternalProblem.g:5024:13: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
+            // InternalProblem.g:5024:15: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
             {
             match('\"'); 
-            // InternalProblem.g:4471:19: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+            // InternalProblem.g:5024:19: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
             loop1:
             do {
                 int alt1=3;
@@ -727,7 +749,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt1) {
                 case 1 :
-                    // InternalProblem.g:4471:20: '\\\\' .
+                    // InternalProblem.g:5024:20: '\\\\' .
                     {
                     match('\\'); 
                     matchAny(); 
@@ -735,7 +757,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:4471:27: ~ ( ( '\\\\' | '\"' ) )
+                    // InternalProblem.g:5024:27: ~ ( ( '\\\\' | '\"' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -772,11 +794,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_QUOTED_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4473:16: ( '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            // InternalProblem.g:4473:18: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+            // InternalProblem.g:5026:16: ( '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalProblem.g:5026:18: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
             {
             match('\''); 
-            // InternalProblem.g:4473:23: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+            // InternalProblem.g:5026:23: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
             loop2:
             do {
                 int alt2=3;
@@ -792,7 +814,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt2) {
                 case 1 :
-                    // InternalProblem.g:4473:24: '\\\\' .
+                    // InternalProblem.g:5026:24: '\\\\' .
                     {
                     match('\\'); 
                     matchAny(); 
@@ -800,7 +822,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:4473:31: ~ ( ( '\\\\' | '\\'' ) )
+                    // InternalProblem.g:5026:31: ~ ( ( '\\\\' | '\\'' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -837,10 +859,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4475:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // InternalProblem.g:4475:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalProblem.g:5028:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalProblem.g:5028:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // InternalProblem.g:4475:11: ( '^' )?
+            // InternalProblem.g:5028:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -849,7 +871,7 @@ public class InternalProblemLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // InternalProblem.g:4475:11: '^'
+                    // InternalProblem.g:5028:11: '^'
                     {
                     match('^'); 
 
@@ -867,7 +889,7 @@ public class InternalProblemLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // InternalProblem.g:4475:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalProblem.g:5028:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -916,10 +938,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4477:10: ( ( '0' .. '9' )+ )
-            // InternalProblem.g:4477:12: ( '0' .. '9' )+
+            // InternalProblem.g:5030:10: ( ( '0' .. '9' )+ )
+            // InternalProblem.g:5030:12: ( '0' .. '9' )+
             {
-            // InternalProblem.g:4477:12: ( '0' .. '9' )+
+            // InternalProblem.g:5030:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -933,7 +955,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt5) {
                 case 1 :
-                    // InternalProblem.g:4477:13: '0' .. '9'
+                    // InternalProblem.g:5030:13: '0' .. '9'
                     {
                     matchRange('0','9'); 
 
@@ -965,12 +987,12 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4479:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalProblem.g:4479:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalProblem.g:5032:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalProblem.g:5032:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalProblem.g:4479:24: ( options {greedy=false; } : . )*
+            // InternalProblem.g:5032:24: ( options {greedy=false; } : . )*
             loop6:
             do {
                 int alt6=2;
@@ -995,7 +1017,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt6) {
                 case 1 :
-                    // InternalProblem.g:4479:52: .
+                    // InternalProblem.g:5032:52: .
                     {
                     matchAny(); 
 
@@ -1025,12 +1047,12 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4481:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalProblem.g:4481:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalProblem.g:5034:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalProblem.g:5034:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // InternalProblem.g:4481:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalProblem.g:5034:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop7:
             do {
                 int alt7=2;
@@ -1043,7 +1065,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt7) {
                 case 1 :
-                    // InternalProblem.g:4481:24: ~ ( ( '\\n' | '\\r' ) )
+                    // InternalProblem.g:5034: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();
@@ -1063,7 +1085,7 @@ public class InternalProblemLexer extends Lexer {
                 }
             } while (true);
 
-            // InternalProblem.g:4481:40: ( ( '\\r' )? '\\n' )?
+            // InternalProblem.g:5034:40: ( ( '\\r' )? '\\n' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -1072,9 +1094,9 @@ public class InternalProblemLexer extends Lexer {
             }
             switch (alt9) {
                 case 1 :
-                    // InternalProblem.g:4481:41: ( '\\r' )? '\\n'
+                    // InternalProblem.g:5034:41: ( '\\r' )? '\\n'
                     {
-                    // InternalProblem.g:4481:41: ( '\\r' )?
+                    // InternalProblem.g:5034:41: ( '\\r' )?
                     int alt8=2;
                     int LA8_0 = input.LA(1);
 
@@ -1083,7 +1105,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     switch (alt8) {
                         case 1 :
-                            // InternalProblem.g:4481:41: '\\r'
+                            // InternalProblem.g:5034:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1115,10 +1137,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4483:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalProblem.g:4483:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalProblem.g:5036:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalProblem.g:5036:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalProblem.g:4483:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalProblem.g:5036:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt10=0;
             loop10:
             do {
@@ -1172,8 +1194,8 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4485:16: ( . )
-            // InternalProblem.g:4485:18: .
+            // InternalProblem.g:5038:16: ( . )
+            // InternalProblem.g:5038:18: .
             {
             matchAny(); 
 
@@ -1188,8 +1210,8 @@ 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 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt11=39;
+        // 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 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt11=40;
         alt11 = dfa11.predict(input);
         switch (alt11) {
             case 1 :
@@ -1410,56 +1432,63 @@ public class InternalProblemLexer extends Lexer {
                 }
                 break;
             case 32 :
-                // InternalProblem.g:1:196: RULE_STRING
+                // InternalProblem.g:1:196: T__43
                 {
-                mRULE_STRING(); 
+                mT__43(); 
 
                 }
                 break;
             case 33 :
-                // InternalProblem.g:1:208: RULE_QUOTED_ID
+                // InternalProblem.g:1:202: RULE_STRING
                 {
-                mRULE_QUOTED_ID(); 
+                mRULE_STRING(); 
 
                 }
                 break;
             case 34 :
-                // InternalProblem.g:1:223: RULE_ID
+                // InternalProblem.g:1:214: RULE_QUOTED_ID
                 {
-                mRULE_ID(); 
+                mRULE_QUOTED_ID(); 
 
                 }
                 break;
             case 35 :
-                // InternalProblem.g:1:231: RULE_INT
+                // InternalProblem.g:1:229: RULE_ID
                 {
-                mRULE_INT(); 
+                mRULE_ID(); 
 
                 }
                 break;
             case 36 :
-                // InternalProblem.g:1:240: RULE_ML_COMMENT
+                // InternalProblem.g:1:237: RULE_INT
                 {
-                mRULE_ML_COMMENT(); 
+                mRULE_INT(); 
 
                 }
                 break;
             case 37 :
-                // InternalProblem.g:1:256: RULE_SL_COMMENT
+                // InternalProblem.g:1:246: RULE_ML_COMMENT
                 {
-                mRULE_SL_COMMENT(); 
+                mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 38 :
-                // InternalProblem.g:1:272: RULE_WS
+                // InternalProblem.g:1:262: RULE_SL_COMMENT
                 {
-                mRULE_WS(); 
+                mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 39 :
-                // InternalProblem.g:1:280: RULE_ANY_OTHER
+                // InternalProblem.g:1:278: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 40 :
+                // InternalProblem.g:1:286: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1473,81 +1502,82 @@ public class InternalProblemLexer extends Lexer {
 
     protected DFA11 dfa11 = new DFA11(this);
     static final String DFA11_eotS =
-        "\1\uffff\1\43\2\45\2\uffff\3\45\2\uffff\2\45\6\uffff\1\45\2\uffff\1\74\2\45\1\100\3\41\2\uffff\1\41\4\uffff\1\45\1\uffff\1\45\2\uffff\3\45\2\uffff\4\45\6\uffff\1\45\4\uffff\2\45\10\uffff\16\45\1\142\1\45\1\144\12\45\1\uffff\1\45\1\uffff\1\160\1\45\1\162\2\45\1\165\1\45\1\167\1\45\1\171\1\45\1\uffff\1\45\1\uffff\2\45\1\uffff\1\45\1\uffff\1\45\1\uffff\1\u0080\1\u0081\1\45\1\u0083\2\45\2\uffff\1\u0086\1\uffff\1\u0087\1\u0088\3\uffff";
+        "\1\uffff\1\43\2\uffff\2\47\2\uffff\3\47\2\uffff\2\47\4\uffff\1\47\2\uffff\1\75\2\47\1\101\3\41\2\uffff\1\41\6\uffff\1\47\1\uffff\1\47\2\uffff\3\47\2\uffff\5\47\4\uffff\1\47\4\uffff\2\47\10\uffff\17\47\1\145\1\47\1\147\5\47\1\155\5\47\1\uffff\1\47\1\uffff\1\164\1\47\1\166\2\47\1\uffff\1\171\1\47\1\173\1\47\1\175\1\47\1\uffff\1\47\1\uffff\2\47\1\uffff\1\47\1\uffff\1\47\1\uffff\1\u0084\1\u0085\1\47\1\u0087\2\47\2\uffff\1\u008a\1\uffff\1\u008b\1\u008c\3\uffff";
     static final String DFA11_eofS =
-        "\u0089\uffff";
+        "\u008d\uffff";
     static final String DFA11_minS =
-        "\1\0\1\56\1\145\1\162\2\uffff\1\162\1\141\1\156\2\uffff\1\154\1\162\6\uffff\1\160\2\uffff\1\55\1\143\1\142\1\75\2\0\1\101\2\uffff\1\52\4\uffff\1\146\1\uffff\1\145\2\uffff\1\165\1\154\1\153\2\uffff\1\141\1\156\1\164\1\162\6\uffff\1\160\4\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\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\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\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";
+        "\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\101\2\uffff\1\52\6\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\4\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 DFA11_maxS =
-        "\1\uffff\1\56\1\145\1\162\2\uffff\1\162\1\141\1\156\2\uffff\1\157\1\170\6\uffff\1\160\2\uffff\1\55\1\143\1\142\1\75\2\uffff\1\172\2\uffff\1\57\4\uffff\1\146\1\uffff\1\157\2\uffff\1\165\1\154\1\153\2\uffff\1\141\1\156\1\164\1\162\6\uffff\1\160\4\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\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\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\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";
+        "\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\55\1\143\1\142\1\75\2\uffff\1\172\2\uffff\1\57\6\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\4\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 DFA11_acceptS =
-        "\4\uffff\1\4\1\5\3\uffff\1\11\1\12\2\uffff\1\16\1\17\1\20\1\21\1\22\1\23\1\uffff\1\25\1\26\7\uffff\1\42\1\43\1\uffff\1\46\1\47\1\32\1\1\1\uffff\1\42\1\uffff\1\4\1\5\3\uffff\1\11\1\12\4\uffff\1\16\1\17\1\20\1\21\1\22\1\23\1\uffff\1\25\1\26\1\27\1\30\2\uffff\1\37\1\36\1\40\1\41\1\43\1\44\1\45\1\46\33\uffff\1\3\1\uffff\1\6\13\uffff\1\7\1\uffff\1\14\2\uffff\1\35\1\uffff\1\31\1\uffff\1\2\6\uffff\1\13\1\10\1\uffff\1\15\2\uffff\1\34\1\24\1\33";
+        "\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\7\uffff\1\43\1\44\1\uffff\1\47\1\50\1\33\1\1\1\2\1\3\1\uffff\1\43\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\31\2\uffff\1\40\1\37\1\41\1\42\1\44\1\45\1\46\1\47\35\uffff\1\5\1\uffff\1\10\5\uffff\1\22\6\uffff\1\11\1\uffff\1\16\2\uffff\1\36\1\uffff\1\32\1\uffff\1\4\6\uffff\1\15\1\12\1\uffff\1\17\2\uffff\1\35\1\25\1\34";
     static final String DFA11_specialS =
-        "\1\0\31\uffff\1\2\1\1\155\uffff}>";
+        "\1\2\31\uffff\1\1\1\0\161\uffff}>";
     static final String[] DFA11_transitionS = {
-            "\11\41\2\40\2\41\1\40\22\41\1\40\1\11\1\32\4\41\1\33\1\24\1\25\1\5\1\31\1\15\1\41\1\1\1\37\12\36\1\26\1\20\1\41\1\4\1\41\1\12\1\41\32\35\1\21\1\41\1\22\1\34\1\35\1\41\1\30\1\35\1\13\1\35\1\14\1\7\10\35\1\23\1\3\1\35\1\2\1\27\1\6\1\10\5\35\1\16\1\41\1\17\uff82\41",
+            "\11\41\2\40\2\41\1\40\22\41\1\40\1\13\1\32\4\41\1\33\1\24\1\25\1\7\1\31\1\2\1\41\1\1\1\37\12\36\1\26\1\3\1\41\1\6\1\41\1\14\1\41\32\35\1\21\1\41\1\22\1\34\1\35\1\41\1\30\1\35\1\15\1\35\1\16\1\11\10\35\1\23\1\5\1\35\1\4\1\27\1\10\1\12\5\35\1\17\1\41\1\20\uff82\41",
             "\1\42",
-            "\1\44",
-            "\1\46",
             "",
             "",
-            "\1\51",
-            "\1\52",
-            "\1\53",
+            "\1\46",
+            "\1\50",
             "",
             "",
-            "\1\56\2\uffff\1\57",
-            "\1\61\5\uffff\1\60",
+            "\1\53",
+            "\1\54",
+            "\1\55",
             "",
             "",
+            "\1\60\2\uffff\1\61",
+            "\1\63\3\uffff\1\64\5\uffff\1\62",
             "",
             "",
             "",
             "",
-            "\1\70",
+            "\1\71",
             "",
             "",
-            "\1\73",
-            "\1\75",
+            "\1\74",
             "\1\76",
             "\1\77",
-            "\0\101",
+            "\1\100",
             "\0\102",
-            "\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\0\103",
+            "\32\47\4\uffff\1\47\1\uffff\32\47",
+            "",
+            "",
+            "\1\105\4\uffff\1\106",
             "",
             "",
-            "\1\104\4\uffff\1\105",
             "",
             "",
             "",
             "",
-            "\1\107",
+            "\1\110",
             "",
-            "\1\110\11\uffff\1\111",
+            "\1\111\11\uffff\1\112",
             "",
             "",
-            "\1\112",
             "\1\113",
             "\1\114",
+            "\1\115",
             "",
             "",
-            "\1\115",
             "\1\116",
             "\1\117",
             "\1\120",
+            "\1\121",
+            "\1\122",
             "",
             "",
             "",
             "",
-            "",
-            "",
-            "\1\121",
+            "\1\123",
             "",
             "",
             "",
             "",
-            "\1\122",
-            "\1\123",
+            "\1\124",
+            "\1\125",
             "",
             "",
             "",
@@ -1556,8 +1586,6 @@ public class InternalProblemLexer extends Lexer {
             "",
             "",
             "",
-            "\1\124",
-            "\1\125",
             "\1\126",
             "\1\127",
             "\1\130",
@@ -1570,55 +1598,60 @@ public class InternalProblemLexer extends Lexer {
             "\1\137",
             "\1\140",
             "\1\141",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\142",
             "\1\143",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\145",
+            "\1\144",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
             "\1\146",
-            "\1\147",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
             "\1\150",
             "\1\151",
             "\1\152",
             "\1\153",
             "\1\154",
-            "\1\155",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
             "\1\156",
-            "",
             "\1\157",
-            "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\160",
             "\1\161",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\162",
+            "",
             "\1\163",
-            "\1\164",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\166",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\170",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\172",
             "",
-            "\1\173",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "\1\165",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "\1\167",
+            "\1\170",
             "",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "\1\172",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
             "\1\174",
-            "\1\175",
-            "",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
             "\1\176",
             "",
             "\1\177",
             "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\u0080",
+            "\1\u0081",
+            "",
             "\1\u0082",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\u0084",
-            "\1\u0085",
             "",
+            "\1\u0083",
+            "",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "\1\u0086",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "\1\u0088",
+            "\1\u0089",
             "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
             "",
             "",
             ""
@@ -1654,47 +1687,67 @@ public class InternalProblemLexer extends Lexer {
             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 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_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 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_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 LA11_27 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA11_27>='\u0000' && LA11_27<='\uFFFF')) ) {s = 67;}
+
+                        else s = 33;
+
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA11_26 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA11_26>='\u0000' && LA11_26<='\uFFFF')) ) {s = 66;}
+
+                        else s = 33;
+
+                        if ( s>=0 ) return s;
+                        break;
+                    case 2 : 
                         int LA11_0 = input.LA(1);
 
                         s = -1;
                         if ( (LA11_0=='.') ) {s = 1;}
 
-                        else if ( (LA11_0=='r') ) {s = 2;}
+                        else if ( (LA11_0==',') ) {s = 2;}
 
-                        else if ( (LA11_0=='p') ) {s = 3;}
+                        else if ( (LA11_0==';') ) {s = 3;}
 
-                        else if ( (LA11_0=='=') ) {s = 4;}
+                        else if ( (LA11_0=='r') ) {s = 4;}
 
-                        else if ( (LA11_0=='*') ) {s = 5;}
+                        else if ( (LA11_0=='p') ) {s = 5;}
 
-                        else if ( (LA11_0=='t') ) {s = 6;}
+                        else if ( (LA11_0=='=') ) {s = 6;}
 
-                        else if ( (LA11_0=='f') ) {s = 7;}
+                        else if ( (LA11_0=='*') ) {s = 7;}
 
-                        else if ( (LA11_0=='u') ) {s = 8;}
+                        else if ( (LA11_0=='t') ) {s = 8;}
 
-                        else if ( (LA11_0=='!') ) {s = 9;}
+                        else if ( (LA11_0=='f') ) {s = 9;}
 
-                        else if ( (LA11_0=='?') ) {s = 10;}
+                        else if ( (LA11_0=='u') ) {s = 10;}
 
-                        else if ( (LA11_0=='c') ) {s = 11;}
+                        else if ( (LA11_0=='!') ) {s = 11;}
 
-                        else if ( (LA11_0=='e') ) {s = 12;}
+                        else if ( (LA11_0=='?') ) {s = 12;}
 
-                        else if ( (LA11_0==',') ) {s = 13;}
+                        else if ( (LA11_0=='c') ) {s = 13;}
 
-                        else if ( (LA11_0=='{') ) {s = 14;}
+                        else if ( (LA11_0=='e') ) {s = 14;}
 
-                        else if ( (LA11_0=='}') ) {s = 15;}
+                        else if ( (LA11_0=='{') ) {s = 15;}
 
-                        else if ( (LA11_0==';') ) {s = 16;}
+                        else if ( (LA11_0=='}') ) {s = 16;}
 
                         else if ( (LA11_0=='[') ) {s = 17;}
 
@@ -1732,26 +1785,6 @@ public class InternalProblemLexer extends Lexer {
 
                         if ( s>=0 ) return s;
                         break;
-                    case 1 : 
-                        int LA11_27 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA11_27>='\u0000' && LA11_27<='\uFFFF')) ) {s = 66;}
-
-                        else s = 33;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA11_26 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA11_26>='\u0000' && LA11_26<='\uFFFF')) ) {s = 65;}
-
-                        else s = 33;
-
-                        if ( s>=0 ) return s;
-                        break;
             }
             NoViableAltException nvae =
                 new NoViableAltException(getDescription(), 11, _s, input);