diff --git a/src/main/java/ghidrust/decompiler/RustDecProvider.java b/src/main/java/ghidrust/decompiler/RustDecProvider.java
index d0a4c1b..7ddf071 100644
--- a/src/main/java/ghidrust/decompiler/RustDecProvider.java
+++ b/src/main/java/ghidrust/decompiler/RustDecProvider.java
@@ -22,9 +22,12 @@ import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
 
 import docking.ComponentProvider;
+import ghidra.util.Msg;
 import ghidra.util.task.ConsoleTaskMonitor;
 import resources.ResourceManager;
 
+import ghidrust.decompiler.parser.c.gen.CParser;
+
 public class RustDecProvider extends ComponentProvider {
     private JPanel panel;
     private JTextArea code_area;
@@ -34,6 +37,7 @@ public class RustDecProvider extends ComponentProvider {
     private Address addr;
 
     private DecompInterface decomp_ifc = null;
+    private CParser transpiler = null;
 
     private static final String EMPTY_LABEL = "<none>";
 
@@ -125,11 +129,20 @@ public class RustDecProvider extends ComponentProvider {
         }
 
         DecompileResults results = decomp_ifc.decompileFunction(func, 0, new ConsoleTaskMonitor());
-        if (results == null || results.getDecompiledFunction() == null) {
+        if (results == null || results.getDecompiledFunction() == null || results.getDecompiledFunction().getC() == null) {
             code_area.setText("[!] Failed to decompile " + func.getName() + "\n");
             return;
         }
 
-        code_area.setText(results.getDecompiledFunction().getC());
+        String decompiled = results.getDecompiledFunction().getC();
+        String rust_code = "";
+
+        try {
+            rust_code = CParser.transpile(decompiled);
+        } catch (Exception e) {
+            rust_code = "/* [!] Failed to transpile " + func.getName() + " */\n" + decompiled;
+        }
+
+        code_area.setText(rust_code);
     }
 }
diff --git a/src/main/java/ghidrust/decompiler/parser/Run.java b/src/main/java/ghidrust/decompiler/parser/Run.java
index fd2ae8b..7e59cdf 100644
--- a/src/main/java/ghidrust/decompiler/parser/Run.java
+++ b/src/main/java/ghidrust/decompiler/parser/Run.java
@@ -4,6 +4,6 @@ import ghidrust.decompiler.parser.c.gen.CParser;
 
 public class Run {
     public static void main(String[] args) {
-        System.out.println(CParser.transpile("int main(int a) { int c = 2; return 0; }"));
+        System.out.println(CParser.transpile("/* hello::return_0 */\n\n        undefined8 hello::return_0(void)\n\n        {\n          return 0;\n        }"));
     }
 }
diff --git a/src/main/java/ghidrust/decompiler/parser/c/CVisitor.java b/src/main/java/ghidrust/decompiler/parser/c/CVisitor.java
index 6b1d672..080f030 100644
--- a/src/main/java/ghidrust/decompiler/parser/c/CVisitor.java
+++ b/src/main/java/ghidrust/decompiler/parser/c/CVisitor.java
@@ -98,7 +98,24 @@ public class CVisitor implements CParserVisitor {
     }
 
     public Object visit(ASTDeclaration node, Object data) {
-        return defaultVisit(node, data);
+        StringBuilder sb = new StringBuilder("");
+        String[] ret = (String[]) node.jjtGetChild(1).jjtAccept(this, data);
+
+        for (int i = 0; i < ret.length / 2; i++) {
+            for (int j = 0; j < indent_level; j++) {
+                sb.append("\t");
+            }
+
+            sb.append("let mut ");
+            sb.append(ret[2 * i]);
+            sb.append(": ");
+            sb.append(node.jjtGetChild(0).jjtAccept(this, data));
+            sb.append(" = ");
+            sb.append(ret[2 * i + 1]);
+            sb.append(";\n");
+        }
+
+        return sb.toString();
     }
 
     public Object visit(ASTDeclarationList node, Object data) {
@@ -106,22 +123,30 @@ public class CVisitor implements CParserVisitor {
     }
 
     public Object visit(ASTDeclarationSpecifiers node, Object data) {
-        return defaultVisit(node, data);
+        return defaultSpacedVisit(node, data);
     }
 
     public Object visit(ASTInitDeclaratorList node, Object data) {
-        if (node.jjtGetNumChildren() == 1) {
-            return node.jjtGetChild(0).jjtAccept(this, data);
-        } else {
-            StringBuilder sb = new StringBuilder("&");
-            sb.append(node.jjtGetChild(0).jjtAccept(this, data));
-            sb.append(node.jjtGetChild(1).jjtAccept(this, data));
-            return sb.toString();
+        String[] ret = new String[node.jjtGetNumChildren() * 2];
+        for (int i = 0; i < node.jjtGetNumChildren(); i++) {
+            String[] child_ret = (String[]) node.jjtGetChild(i).jjtAccept(this, data);
+            ret[2 * i] = child_ret[0];
+            ret[2 * i + 1] = child_ret[1];
         }
+
+        return ret;
     }
 
     public Object visit(ASTInitDeclarator node, Object data) {
-        return defaultVisit(node, data);
+        String[] ret = new String[2];
+        ret[0] = (String) node.jjtGetChild(0).jjtAccept(this, data);
+        if (node.jjtGetNumChildren() == 1) {
+            ret[1] = "0";
+        } else {
+            ret[1] = (String) node.jjtGetChild(1).jjtAccept(this, data);
+        }
+
+        return ret;
     }
 
     public Object visit(ASTSpecifierQualifierList node, Object data) {
@@ -175,8 +200,6 @@ public class CVisitor implements CParserVisitor {
 
     public Object visit(ASTParameterDeclaration node, Object data) {
         StringBuilder param = new StringBuilder((String) defaultSpacedVisit(node, data));
-        /* Get rid of the trailing space */
-        param.setLength(param.length() - 1);
         return param.toString();
     }
 
@@ -237,11 +260,9 @@ public class CVisitor implements CParserVisitor {
         for (int i = 0; i < indent_level; i++) {
             sb.append("\t");
         }
-        
-        if (node.jjtGetNumChildren() == 0 || node.jjtGetChild(0) instanceof ASTExpression) {
-            sb.append("return ");
+
+        if (node.jjtGetNumChildren() > 0 && node.jjtGetChild(0) instanceof ASTExpression) {
             sb.append(node.jjtGetChild(0).jjtAccept(this, data));
-            sb.append(";");
         } else {
             sb.append(defaultVisit(node, data));
         }
diff --git a/src/main/java/ghidrust/decompiler/parser/c/gen/CParser.java b/src/main/java/ghidrust/decompiler/parser/c/gen/CParser.java
index 18fed88..f9fdcfc 100644
--- a/src/main/java/ghidrust/decompiler/parser/c/gen/CParser.java
+++ b/src/main/java/ghidrust/decompiler/parser/c/gen/CParser.java
@@ -8,7 +8,7 @@ import java.nio.charset.StandardCharsets;
 import ghidrust.decompiler.parser.c.CVisitor;
 
 public class CParser/*@bgen(jjtree)*/implements CParserTreeConstants, CParserConstants {/*@bgen(jjtree)*/
-  protected static JJTCParserState jjtree = new JJTCParserState();private static CParser c_parser;
+  protected JJTCParserState jjtree = new JJTCParserState();private static CParser c_parser;
 
         // Run the parser
         public static String transpile(String c_code) {
@@ -29,7 +29,7 @@ public class CParser/*@bgen(jjtree)*/implements CParserTreeConstants, CParserCon
         return (String) c_parser.FunctionDefinition().jjtAccept(visitor, null);
         }
 
-  static final public SimpleNode FunctionDefinition() throws ParseException {/*@bgen(jjtree) FunctionDefinition */
+  final public SimpleNode FunctionDefinition() throws ParseException {/*@bgen(jjtree) FunctionDefinition */
   ASTFunctionDefinition jjtn000 = new ASTFunctionDefinition(JJTFUNCTIONDEFINITION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -66,7 +66,7 @@ if (jjtc000) {
     throw new Error("Missing return statement in function");
 }
 
-  static final public void Declaration() throws ParseException {/*@bgen(jjtree) Declaration */
+  final public void Declaration() throws ParseException {/*@bgen(jjtree) Declaration */
   ASTDeclaration jjtn000 = new ASTDeclaration(JJTDECLARATION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -74,8 +74,8 @@ if (jjtc000) {
       DeclarationSpecifiers();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IDENTIFIER:
-      case 60:
-      case 64:{
+      case 61:
+      case 65:{
         InitDeclaratorList();
         break;
         }
@@ -83,7 +83,7 @@ if (jjtc000) {
         jj_la1[0] = jj_gen;
         ;
       }
-      jj_consume_token(57);
+      jj_consume_token(58);
     } catch (Throwable jjte000) {
 if (jjtc000) {
             jjtree.clearNodeScope(jjtn000);
@@ -105,7 +105,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void DeclarationList() throws ParseException {/*@bgen(jjtree) DeclarationList */
+  final public void DeclarationList() throws ParseException {/*@bgen(jjtree) DeclarationList */
   ASTDeclarationList jjtn000 = new ASTDeclarationList(JJTDECLARATIONLIST);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -140,7 +140,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void DeclarationSpecifiers() throws ParseException {/*@bgen(jjtree) DeclarationSpecifiers */
+  final public void DeclarationSpecifiers() throws ParseException {/*@bgen(jjtree) DeclarationSpecifiers */
   ASTDeclarationSpecifiers jjtn000 = new ASTDeclarationSpecifiers(JJTDECLARATIONSPECIFIERS);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -214,7 +214,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void StorageClassSpecifier() throws ParseException {/*@bgen(jjtree) GhostStringToken */
+  final public void StorageClassSpecifier() throws ParseException {/*@bgen(jjtree) GhostStringToken */
         ASTGhostStringToken jjtn000 = new ASTGhostStringToken(JJTGHOSTSTRINGTOKEN);
         boolean jjtc000 = true;
         jjtree.openNodeScope(jjtn000);Token t;
@@ -255,7 +255,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void TypeSpecifier() throws ParseException {/*@bgen(jjtree) TypeStringToken */
+  final public void TypeSpecifier() throws ParseException {/*@bgen(jjtree) TypeStringToken */
         ASTTypeStringToken jjtn000 = new ASTTypeStringToken(JJTTYPESTRINGTOKEN);
         boolean jjtc000 = true;
         jjtree.openNodeScope(jjtn000);Token t;
@@ -320,7 +320,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void TypeQualifier() throws ParseException {/*@bgen(jjtree) StringToken */
+  final public void TypeQualifier() throws ParseException {/*@bgen(jjtree) StringToken */
         ASTStringToken jjtn000 = new ASTStringToken(JJTSTRINGTOKEN);
         boolean jjtc000 = true;
         jjtree.openNodeScope(jjtn000);Token t;
@@ -349,7 +349,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void InitDeclaratorList() throws ParseException {/*@bgen(jjtree) InitDeclaratorList */
+  final public void InitDeclaratorList() throws ParseException {/*@bgen(jjtree) InitDeclaratorList */
   ASTInitDeclaratorList jjtn000 = new ASTInitDeclaratorList(JJTINITDECLARATORLIST);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -358,7 +358,7 @@ if (jjtc000) {
       label_2:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 58:{
+        case 59:{
           ;
           break;
           }
@@ -366,7 +366,7 @@ if (jjtc000) {
           jj_la1[5] = jj_gen;
           break label_2;
         }
-        jj_consume_token(58);
+        jj_consume_token(59);
         InitDeclarator();
       }
     } catch (Throwable jjte000) {
@@ -390,15 +390,15 @@ if (jjtc000) {
     }
 }
 
-  static final public void InitDeclarator() throws ParseException {/*@bgen(jjtree) InitDeclarator */
+  final public void InitDeclarator() throws ParseException {/*@bgen(jjtree) InitDeclarator */
   ASTInitDeclarator jjtn000 = new ASTInitDeclarator(JJTINITDECLARATOR);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       Declarator();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 59:{
-        jj_consume_token(59);
+      case 60:{
+        jj_consume_token(60);
         Initializer();
         break;
         }
@@ -427,7 +427,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void SpecifierQualifierList() throws ParseException {/*@bgen(jjtree) SpecifierQualifierList */
+  final public void SpecifierQualifierList() throws ParseException {/*@bgen(jjtree) SpecifierQualifierList */
   ASTSpecifierQualifierList jjtn000 = new ASTSpecifierQualifierList(JJTSPECIFIERQUALIFIERLIST);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -488,13 +488,13 @@ if (jjtc000) {
     }
 }
 
-  static final public void Declarator() throws ParseException {/*@bgen(jjtree) Declarator */
+  final public void Declarator() throws ParseException {/*@bgen(jjtree) Declarator */
   ASTDeclarator jjtn000 = new ASTDeclarator(JJTDECLARATOR);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 64:{
+      case 65:{
         Pointer();
         break;
         }
@@ -524,7 +524,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void DirectDeclarator() throws ParseException {/*@bgen(jjtree) DirectDeclarator */
+  final public void DirectDeclarator() throws ParseException {/*@bgen(jjtree) DirectDeclarator */
   ASTDirectDeclarator jjtn000 = new ASTDirectDeclarator(JJTDIRECTDECLARATOR);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -534,10 +534,10 @@ if (jjtc000) {
         Identifier();
         break;
         }
-      case 60:{
-        jj_consume_token(60);
-        Declarator();
+      case 61:{
         jj_consume_token(61);
+        Declarator();
+        jj_consume_token(62);
         break;
         }
       default:
@@ -548,8 +548,8 @@ if (jjtc000) {
       label_3:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 60:
-        case 62:{
+        case 61:
+        case 63:{
           ;
           break;
           }
@@ -558,8 +558,8 @@ if (jjtc000) {
           break label_3;
         }
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 62:{
-          jj_consume_token(62);
+        case 63:{
+          jj_consume_token(63);
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case INTEGER_LITERAL:
           case FLOATING_POINT_LITERAL:
@@ -567,15 +567,15 @@ if (jjtc000) {
           case STRING_LITERAL:
           case SIZEOF:
           case IDENTIFIER:
-          case 60:
-          case 64:
-          case 84:
-          case 93:
+          case 61:
+          case 65:
+          case 85:
           case 94:
-          case 97:
+          case 95:
           case 98:
           case 99:
-          case 100:{
+          case 100:
+          case 101:{
             ConstantExpression();
             break;
             }
@@ -583,19 +583,19 @@ if (jjtc000) {
             jj_la1[11] = jj_gen;
             ;
           }
-          jj_consume_token(63);
+          jj_consume_token(64);
           break;
           }
         default:
           jj_la1[13] = jj_gen;
           if (jj_2_8(3)) {
-            jj_consume_token(60);
-            ParameterTypeList();
             jj_consume_token(61);
+            ParameterTypeList();
+            jj_consume_token(62);
           } else {
             switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case 60:{
-              jj_consume_token(60);
+            case 61:{
+              jj_consume_token(61);
               switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
               case IDENTIFIER:{
                 IdentifierList();
@@ -605,7 +605,7 @@ if (jjtc000) {
                 jj_la1[12] = jj_gen;
                 ;
               }
-              jj_consume_token(61);
+              jj_consume_token(62);
               break;
               }
             default:
@@ -637,12 +637,12 @@ if (jjtc000) {
     }
 }
 
-  static final public void Pointer() throws ParseException {/*@bgen(jjtree) Pointer */
+  final public void Pointer() throws ParseException {/*@bgen(jjtree) Pointer */
   ASTPointer jjtn000 = new ASTPointer(JJTPOINTER);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
-      jj_consume_token(64);
+      jj_consume_token(65);
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case VOLATILE:
       case CONST:{
@@ -654,7 +654,7 @@ if (jjtc000) {
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 64:{
+      case 65:{
         Pointer();
         break;
         }
@@ -683,7 +683,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void TypeQualifierList() throws ParseException {/*@bgen(jjtree) TypeQualifierList */
+  final public void TypeQualifierList() throws ParseException {/*@bgen(jjtree) TypeQualifierList */
   ASTTypeQualifierList jjtn000 = new ASTTypeQualifierList(JJTTYPEQUALIFIERLIST);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -723,16 +723,16 @@ if (jjtc000) {
     }
 }
 
-  static final public void ParameterTypeList() throws ParseException {/*@bgen(jjtree) ParameterTypeList */
+  final public void ParameterTypeList() throws ParseException {/*@bgen(jjtree) ParameterTypeList */
   ASTParameterTypeList jjtn000 = new ASTParameterTypeList(JJTPARAMETERTYPELIST);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       ParameterList();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 58:{
-        jj_consume_token(58);
-        jj_consume_token(65);
+      case 59:{
+        jj_consume_token(59);
+        jj_consume_token(66);
         break;
         }
       default:
@@ -760,7 +760,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void ParameterList() throws ParseException {/*@bgen(jjtree) ParameterList */
+  final public void ParameterList() throws ParseException {/*@bgen(jjtree) ParameterList */
   ASTParameterList jjtn000 = new ASTParameterList(JJTPARAMETERLIST);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -773,7 +773,7 @@ if (jjtc000) {
         } else {
           break label_5;
         }
-        jj_consume_token(58);
+        jj_consume_token(59);
         ParameterDeclaration();
       }
     } catch (Throwable jjte000) {
@@ -797,7 +797,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void ParameterDeclaration() throws ParseException {/*@bgen(jjtree) ParameterDeclaration */
+  final public void ParameterDeclaration() throws ParseException {/*@bgen(jjtree) ParameterDeclaration */
   ASTParameterDeclaration jjtn000 = new ASTParameterDeclaration(JJTPARAMETERDECLARATION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -807,9 +807,9 @@ if (jjtc000) {
         Declarator();
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 60:
-        case 62:
-        case 64:{
+        case 61:
+        case 63:
+        case 65:{
           AbstractDeclarator();
           break;
           }
@@ -839,7 +839,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void IdentifierList() throws ParseException {/*@bgen(jjtree) IdentifierList */
+  final public void IdentifierList() throws ParseException {/*@bgen(jjtree) IdentifierList */
   ASTIdentifierList jjtn000 = new ASTIdentifierList(JJTIDENTIFIERLIST);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -848,7 +848,7 @@ if (jjtc000) {
       label_6:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 58:{
+        case 59:{
           ;
           break;
           }
@@ -856,7 +856,7 @@ if (jjtc000) {
           jj_la1[20] = jj_gen;
           break label_6;
         }
-        jj_consume_token(58);
+        jj_consume_token(59);
         Identifier();
       }
     } catch (Throwable jjte000) {
@@ -880,7 +880,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void Initializer() throws ParseException {/*@bgen(jjtree) Initializer */
+  final public void Initializer() throws ParseException {/*@bgen(jjtree) Initializer */
   ASTInitializer jjtn000 = new ASTInitializer(JJTINITIALIZER);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -892,31 +892,31 @@ if (jjtc000) {
       case STRING_LITERAL:
       case SIZEOF:
       case IDENTIFIER:
-      case 60:
-      case 64:
-      case 84:
-      case 93:
+      case 61:
+      case 65:
+      case 85:
       case 94:
-      case 97:
+      case 95:
       case 98:
       case 99:
-      case 100:{
+      case 100:
+      case 101:{
         AssignmentExpression();
         break;
         }
-      case 66:{
-        jj_consume_token(66);
+      case 67:{
+        jj_consume_token(67);
         InitializerList();
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 58:{
-          jj_consume_token(58);
+        case 59:{
+          jj_consume_token(59);
           break;
           }
         default:
           jj_la1[21] = jj_gen;
           ;
         }
-        jj_consume_token(67);
+        jj_consume_token(68);
         break;
         }
       default:
@@ -945,7 +945,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void InitializerList() throws ParseException {/*@bgen(jjtree) InitializerList */
+  final public void InitializerList() throws ParseException {/*@bgen(jjtree) InitializerList */
   ASTInitializerList jjtn000 = new ASTInitializerList(JJTINITIALIZERLIST);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -958,7 +958,7 @@ if (jjtc000) {
         } else {
           break label_7;
         }
-        jj_consume_token(58);
+        jj_consume_token(59);
         Initializer();
       }
     } catch (Throwable jjte000) {
@@ -982,16 +982,16 @@ if (jjtc000) {
     }
 }
 
-  static final public void TypeName() throws ParseException {/*@bgen(jjtree) TypeName */
+  final public void TypeName() throws ParseException {/*@bgen(jjtree) TypeName */
   ASTTypeName jjtn000 = new ASTTypeName(JJTTYPENAME);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       SpecifierQualifierList();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 60:
-      case 62:
-      case 64:{
+      case 61:
+      case 63:
+      case 65:{
         AbstractDeclarator();
         break;
         }
@@ -1020,7 +1020,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void AbstractDeclarator() throws ParseException {/*@bgen(jjtree) AbstractDeclarator */
+  final public void AbstractDeclarator() throws ParseException {/*@bgen(jjtree) AbstractDeclarator */
   ASTAbstractDeclarator jjtn000 = new ASTAbstractDeclarator(JJTABSTRACTDECLARATOR);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -1029,11 +1029,11 @@ if (jjtc000) {
         Pointer();
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 60:
-        case 62:
-        case 64:{
+        case 61:
+        case 63:
+        case 65:{
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case 64:{
+          case 65:{
             Pointer();
             break;
             }
@@ -1071,19 +1071,19 @@ if (jjtc000) {
     }
 }
 
-  static final public void DirectAbstractDeclarator() throws ParseException {/*@bgen(jjtree) DirectAbstractDeclarator */
+  final public void DirectAbstractDeclarator() throws ParseException {/*@bgen(jjtree) DirectAbstractDeclarator */
   ASTDirectAbstractDeclarator jjtn000 = new ASTDirectAbstractDeclarator(JJTDIRECTABSTRACTDECLARATOR);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       if (jj_2_13(2)) {
-        jj_consume_token(60);
-        AbstractDeclarator();
         jj_consume_token(61);
+        AbstractDeclarator();
+        jj_consume_token(62);
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 62:{
-          jj_consume_token(62);
+        case 63:{
+          jj_consume_token(63);
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case INTEGER_LITERAL:
           case FLOATING_POINT_LITERAL:
@@ -1091,15 +1091,15 @@ if (jjtc000) {
           case STRING_LITERAL:
           case SIZEOF:
           case IDENTIFIER:
-          case 60:
-          case 64:
-          case 84:
-          case 93:
+          case 61:
+          case 65:
+          case 85:
           case 94:
-          case 97:
+          case 95:
           case 98:
           case 99:
-          case 100:{
+          case 100:
+          case 101:{
             ConstantExpression();
             break;
             }
@@ -1107,11 +1107,11 @@ if (jjtc000) {
             jj_la1[26] = jj_gen;
             ;
           }
-          jj_consume_token(63);
+          jj_consume_token(64);
           break;
           }
-        case 60:{
-          jj_consume_token(60);
+        case 61:{
+          jj_consume_token(61);
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case UNDEFINED_TYPE:
           case VOLATILE:
@@ -1138,7 +1138,7 @@ if (jjtc000) {
             jj_la1[27] = jj_gen;
             ;
           }
-          jj_consume_token(61);
+          jj_consume_token(62);
           break;
           }
         default:
@@ -1150,8 +1150,8 @@ if (jjtc000) {
       label_8:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 60:
-        case 62:{
+        case 61:
+        case 63:{
           ;
           break;
           }
@@ -1160,8 +1160,8 @@ if (jjtc000) {
           break label_8;
         }
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 62:{
-          jj_consume_token(62);
+        case 63:{
+          jj_consume_token(63);
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case INTEGER_LITERAL:
           case FLOATING_POINT_LITERAL:
@@ -1169,15 +1169,15 @@ if (jjtc000) {
           case STRING_LITERAL:
           case SIZEOF:
           case IDENTIFIER:
-          case 60:
-          case 64:
-          case 84:
-          case 93:
+          case 61:
+          case 65:
+          case 85:
           case 94:
-          case 97:
+          case 95:
           case 98:
           case 99:
-          case 100:{
+          case 100:
+          case 101:{
             ConstantExpression();
             break;
             }
@@ -1185,11 +1185,11 @@ if (jjtc000) {
             jj_la1[30] = jj_gen;
             ;
           }
-          jj_consume_token(63);
+          jj_consume_token(64);
           break;
           }
-        case 60:{
-          jj_consume_token(60);
+        case 61:{
+          jj_consume_token(61);
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case UNDEFINED_TYPE:
           case VOLATILE:
@@ -1216,7 +1216,7 @@ if (jjtc000) {
             jj_la1[31] = jj_gen;
             ;
           }
-          jj_consume_token(61);
+          jj_consume_token(62);
           break;
           }
         default:
@@ -1246,7 +1246,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void Statement() throws ParseException {/*@bgen(jjtree) Statement */
+  final public void Statement() throws ParseException {/*@bgen(jjtree) Statement */
   ASTStatement jjtn000 = new ASTStatement(JJTSTATEMENT);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -1279,20 +1279,20 @@ if (jjtc000) {
         case INT:
         case CODE:
         case IDENTIFIER:
-        case 57:
-        case 60:
-        case 64:
-        case 84:
-        case 93:
+        case 58:
+        case 61:
+        case 65:
+        case 85:
         case 94:
-        case 97:
+        case 95:
         case 98:
         case 99:
-        case 100:{
+        case 100:
+        case 101:{
           ExpressionStatement();
           break;
           }
-        case 66:{
+        case 67:{
           CompoundStatement();
           break;
           }
@@ -1341,7 +1341,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void LabeledStatement() throws ParseException {/*@bgen(jjtree) LabeledStatement */
+  final public void LabeledStatement() throws ParseException {/*@bgen(jjtree) LabeledStatement */
   ASTLabeledStatement jjtn000 = new ASTLabeledStatement(JJTLABELEDSTATEMENT);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -1349,20 +1349,20 @@ if (jjtc000) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IDENTIFIER:{
         Identifier();
-        jj_consume_token(68);
+        jj_consume_token(69);
         Statement();
         break;
         }
       case CASE:{
         jj_consume_token(CASE);
         ConstantExpression();
-        jj_consume_token(68);
+        jj_consume_token(69);
         Statement();
         break;
         }
       case DFLT:{
         jj_consume_token(DFLT);
-        jj_consume_token(68);
+        jj_consume_token(69);
         Statement();
         break;
         }
@@ -1392,7 +1392,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void ExpressionStatement() throws ParseException {/*@bgen(jjtree) ExpressionStatement */
+  final public void ExpressionStatement() throws ParseException {/*@bgen(jjtree) ExpressionStatement */
   ASTExpressionStatement jjtn000 = new ASTExpressionStatement(JJTEXPRESSIONSTATEMENT);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -1422,15 +1422,15 @@ if (jjtc000) {
       case INT:
       case CODE:
       case IDENTIFIER:
-      case 60:
-      case 64:
-      case 84:
-      case 93:
+      case 61:
+      case 65:
+      case 85:
       case 94:
-      case 97:
+      case 95:
       case 98:
       case 99:
-      case 100:{
+      case 100:
+      case 101:{
         Expression();
         break;
         }
@@ -1438,7 +1438,7 @@ if (jjtc000) {
         jj_la1[35] = jj_gen;
         ;
       }
-      jj_consume_token(57);
+      jj_consume_token(58);
     } catch (Throwable jjte000) {
 if (jjtc000) {
             jjtree.clearNodeScope(jjtn000);
@@ -1460,12 +1460,12 @@ if (jjtc000) {
     }
 }
 
-  static final public void CompoundStatement() throws ParseException {/*@bgen(jjtree) CompoundStatement */
+  final public void CompoundStatement() throws ParseException {/*@bgen(jjtree) CompoundStatement */
   ASTCompoundStatement jjtn000 = new ASTCompoundStatement(JJTCOMPOUNDSTATEMENT);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
-      jj_consume_token(66);
+      jj_consume_token(67);
       if (jj_2_15(2147483647)) {
         DeclarationList();
       } else {
@@ -1507,17 +1507,17 @@ if (jjtc000) {
       case DO:
       case CODE:
       case IDENTIFIER:
-      case 57:
-      case 60:
-      case 64:
-      case 66:
-      case 84:
-      case 93:
+      case 58:
+      case 61:
+      case 65:
+      case 67:
+      case 85:
       case 94:
-      case 97:
+      case 95:
       case 98:
       case 99:
-      case 100:{
+      case 100:
+      case 101:{
         StatementList();
         break;
         }
@@ -1525,7 +1525,7 @@ if (jjtc000) {
         jj_la1[36] = jj_gen;
         ;
       }
-      jj_consume_token(67);
+      jj_consume_token(68);
     } catch (Throwable jjte000) {
 if (jjtc000) {
             jjtree.clearNodeScope(jjtn000);
@@ -1547,7 +1547,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void StatementList() throws ParseException {/*@bgen(jjtree) StatementList */
+  final public void StatementList() throws ParseException {/*@bgen(jjtree) StatementList */
   ASTStatementList jjtn000 = new ASTStatementList(JJTSTATEMENTLIST);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -1591,17 +1591,17 @@ if (jjtc000) {
         case DO:
         case CODE:
         case IDENTIFIER:
-        case 57:
-        case 60:
-        case 64:
-        case 66:
-        case 84:
-        case 93:
+        case 58:
+        case 61:
+        case 65:
+        case 67:
+        case 85:
         case 94:
-        case 97:
+        case 95:
         case 98:
         case 99:
-        case 100:{
+        case 100:
+        case 101:{
           ;
           break;
           }
@@ -1631,7 +1631,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void SelectionStatement() throws ParseException {/*@bgen(jjtree) SelectionStatement */
+  final public void SelectionStatement() throws ParseException {/*@bgen(jjtree) SelectionStatement */
   ASTSelectionStatement jjtn000 = new ASTSelectionStatement(JJTSELECTIONSTATEMENT);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -1639,9 +1639,9 @@ if (jjtc000) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IF:{
         jj_consume_token(IF);
-        jj_consume_token(60);
-        Expression();
         jj_consume_token(61);
+        Expression();
+        jj_consume_token(62);
         Statement();
         if (jj_2_16(2)) {
           jj_consume_token(ELSE);
@@ -1653,9 +1653,9 @@ if (jjtc000) {
         }
       case SWITCH:{
         jj_consume_token(SWITCH);
-        jj_consume_token(60);
-        Expression();
         jj_consume_token(61);
+        Expression();
+        jj_consume_token(62);
         Statement();
         break;
         }
@@ -1685,7 +1685,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void IterationStatement() throws ParseException {/*@bgen(jjtree) IterationStatement */
+  final public void IterationStatement() throws ParseException {/*@bgen(jjtree) IterationStatement */
   ASTIterationStatement jjtn000 = new ASTIterationStatement(JJTITERATIONSTATEMENT);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -1693,9 +1693,9 @@ if (jjtc000) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case WHILE:{
         jj_consume_token(WHILE);
-        jj_consume_token(60);
-        Expression();
         jj_consume_token(61);
+        Expression();
+        jj_consume_token(62);
         Statement();
         break;
         }
@@ -1703,15 +1703,15 @@ if (jjtc000) {
         jj_consume_token(DO);
         Statement();
         jj_consume_token(WHILE);
-        jj_consume_token(60);
-        Expression();
         jj_consume_token(61);
-        jj_consume_token(57);
+        Expression();
+        jj_consume_token(62);
+        jj_consume_token(58);
         break;
         }
       case FOR:{
         jj_consume_token(FOR);
-        jj_consume_token(60);
+        jj_consume_token(61);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case INTEGER_LITERAL:
         case FLOATING_POINT_LITERAL:
@@ -1737,15 +1737,15 @@ if (jjtc000) {
         case INT:
         case CODE:
         case IDENTIFIER:
-        case 60:
-        case 64:
-        case 84:
-        case 93:
+        case 61:
+        case 65:
+        case 85:
         case 94:
-        case 97:
+        case 95:
         case 98:
         case 99:
-        case 100:{
+        case 100:
+        case 101:{
           Expression();
           break;
           }
@@ -1753,7 +1753,7 @@ if (jjtc000) {
           jj_la1[39] = jj_gen;
           ;
         }
-        jj_consume_token(57);
+        jj_consume_token(58);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case INTEGER_LITERAL:
         case FLOATING_POINT_LITERAL:
@@ -1779,15 +1779,15 @@ if (jjtc000) {
         case INT:
         case CODE:
         case IDENTIFIER:
-        case 60:
-        case 64:
-        case 84:
-        case 93:
+        case 61:
+        case 65:
+        case 85:
         case 94:
-        case 97:
+        case 95:
         case 98:
         case 99:
-        case 100:{
+        case 100:
+        case 101:{
           Expression();
           break;
           }
@@ -1795,7 +1795,7 @@ if (jjtc000) {
           jj_la1[40] = jj_gen;
           ;
         }
-        jj_consume_token(57);
+        jj_consume_token(58);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case INTEGER_LITERAL:
         case FLOATING_POINT_LITERAL:
@@ -1821,15 +1821,15 @@ if (jjtc000) {
         case INT:
         case CODE:
         case IDENTIFIER:
-        case 60:
-        case 64:
-        case 84:
-        case 93:
+        case 61:
+        case 65:
+        case 85:
         case 94:
-        case 97:
+        case 95:
         case 98:
         case 99:
-        case 100:{
+        case 100:
+        case 101:{
           Expression();
           break;
           }
@@ -1837,7 +1837,7 @@ if (jjtc000) {
           jj_la1[41] = jj_gen;
           ;
         }
-        jj_consume_token(61);
+        jj_consume_token(62);
         Statement();
         break;
         }
@@ -1867,7 +1867,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void JumpStatement() throws ParseException {/*@bgen(jjtree) JumpStatement */
+  final public void JumpStatement() throws ParseException {/*@bgen(jjtree) JumpStatement */
   ASTJumpStatement jjtn000 = new ASTJumpStatement(JJTJUMPSTATEMENT);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -1876,17 +1876,17 @@ if (jjtc000) {
       case GOTO:{
         jj_consume_token(GOTO);
         Identifier();
-        jj_consume_token(57);
+        jj_consume_token(58);
         break;
         }
       case CONTINUE:{
         jj_consume_token(CONTINUE);
-        jj_consume_token(57);
+        jj_consume_token(58);
         break;
         }
       case BREAK:{
         jj_consume_token(BREAK);
-        jj_consume_token(57);
+        jj_consume_token(58);
         break;
         }
       case RETURN:{
@@ -1916,15 +1916,15 @@ if (jjtc000) {
         case INT:
         case CODE:
         case IDENTIFIER:
-        case 60:
-        case 64:
-        case 84:
-        case 93:
+        case 61:
+        case 65:
+        case 85:
         case 94:
-        case 97:
+        case 95:
         case 98:
         case 99:
-        case 100:{
+        case 100:
+        case 101:{
           Expression();
           break;
           }
@@ -1932,7 +1932,7 @@ if (jjtc000) {
           jj_la1[43] = jj_gen;
           ;
         }
-        jj_consume_token(57);
+        jj_consume_token(58);
         break;
         }
       default:
@@ -1961,7 +1961,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void Expression() throws ParseException {/*@bgen(jjtree) Expression */
+  final public void Expression() throws ParseException {/*@bgen(jjtree) Expression */
   ASTExpression jjtn000 = new ASTExpression(JJTEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -1973,20 +1973,20 @@ if (jjtc000) {
       case STRING_LITERAL:
       case SIZEOF:
       case IDENTIFIER:
-      case 60:
-      case 64:
-      case 84:
-      case 93:
+      case 61:
+      case 65:
+      case 85:
       case 94:
-      case 97:
+      case 95:
       case 98:
       case 99:
-      case 100:{
+      case 100:
+      case 101:{
         AssignmentExpression();
         label_10:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case 58:{
+          case 59:{
             ;
             break;
             }
@@ -1994,7 +1994,7 @@ if (jjtc000) {
             jj_la1[45] = jj_gen;
             break label_10;
           }
-          jj_consume_token(58);
+          jj_consume_token(59);
           AssignmentExpression();
         }
         break;
@@ -2047,7 +2047,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void AssignmentExpression() throws ParseException {/*@bgen(jjtree) AssignmentExpression */
+  final public void AssignmentExpression() throws ParseException {/*@bgen(jjtree) AssignmentExpression */
   ASTAssignmentExpression jjtn000 = new ASTAssignmentExpression(JJTASSIGNMENTEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -2083,18 +2083,14 @@ if (jjtc000) {
     }
 }
 
-  static final public void AssignmentOperator() throws ParseException {/*@bgen(jjtree) AssignmentOperator */
+  final public void AssignmentOperator() throws ParseException {/*@bgen(jjtree) AssignmentOperator */
   ASTAssignmentOperator jjtn000 = new ASTAssignmentOperator(JJTASSIGNMENTOPERATOR);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 59:{
-        jj_consume_token(59);
-        break;
-        }
-      case 69:{
-        jj_consume_token(69);
+      case 60:{
+        jj_consume_token(60);
         break;
         }
       case 70:{
@@ -2133,6 +2129,10 @@ if (jjtc000) {
         jj_consume_token(78);
         break;
         }
+      case 79:{
+        jj_consume_token(79);
+        break;
+        }
       default:
         jj_la1[47] = jj_gen;
         jj_consume_token(-1);
@@ -2145,17 +2145,17 @@ if (jjtc000) {
     }
 }
 
-  static final public void ConditionalExpression() throws ParseException {/*@bgen(jjtree) ConditionalExpression */
+  final public void ConditionalExpression() throws ParseException {/*@bgen(jjtree) ConditionalExpression */
   ASTConditionalExpression jjtn000 = new ASTConditionalExpression(JJTCONDITIONALEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       LogicalORExpression();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 79:{
-        jj_consume_token(79);
+      case 80:{
+        jj_consume_token(80);
         Expression();
-        jj_consume_token(68);
+        jj_consume_token(69);
         ConditionalExpression();
         break;
         }
@@ -2184,7 +2184,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void ConstantExpression() throws ParseException {/*@bgen(jjtree) ConstantExpression */
+  final public void ConstantExpression() throws ParseException {/*@bgen(jjtree) ConstantExpression */
   ASTConstantExpression jjtn000 = new ASTConstantExpression(JJTCONSTANTEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -2211,15 +2211,15 @@ if (jjtc000) {
     }
 }
 
-  static final public void LogicalORExpression() throws ParseException {/*@bgen(jjtree) LogicalORExpression */
+  final public void LogicalORExpression() throws ParseException {/*@bgen(jjtree) LogicalORExpression */
   ASTLogicalORExpression jjtn000 = new ASTLogicalORExpression(JJTLOGICALOREXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       LogicalANDExpression();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 80:{
-        jj_consume_token(80);
+      case 81:{
+        jj_consume_token(81);
         LogicalORExpression();
         break;
         }
@@ -2248,15 +2248,15 @@ if (jjtc000) {
     }
 }
 
-  static final public void LogicalANDExpression() throws ParseException {/*@bgen(jjtree) LogicalANDExpression */
+  final public void LogicalANDExpression() throws ParseException {/*@bgen(jjtree) LogicalANDExpression */
   ASTLogicalANDExpression jjtn000 = new ASTLogicalANDExpression(JJTLOGICALANDEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       InclusiveORExpression();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 81:{
-        jj_consume_token(81);
+      case 82:{
+        jj_consume_token(82);
         LogicalANDExpression();
         break;
         }
@@ -2285,15 +2285,15 @@ if (jjtc000) {
     }
 }
 
-  static final public void InclusiveORExpression() throws ParseException {/*@bgen(jjtree) InclusiveORExpression */
+  final public void InclusiveORExpression() throws ParseException {/*@bgen(jjtree) InclusiveORExpression */
   ASTInclusiveORExpression jjtn000 = new ASTInclusiveORExpression(JJTINCLUSIVEOREXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       ExclusiveORExpression();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 82:{
-        jj_consume_token(82);
+      case 83:{
+        jj_consume_token(83);
         InclusiveORExpression();
         break;
         }
@@ -2322,15 +2322,15 @@ if (jjtc000) {
     }
 }
 
-  static final public void ExclusiveORExpression() throws ParseException {/*@bgen(jjtree) ExclusiveORExpression */
+  final public void ExclusiveORExpression() throws ParseException {/*@bgen(jjtree) ExclusiveORExpression */
   ASTExclusiveORExpression jjtn000 = new ASTExclusiveORExpression(JJTEXCLUSIVEOREXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       ANDExpression();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 83:{
-        jj_consume_token(83);
+      case 84:{
+        jj_consume_token(84);
         ExclusiveORExpression();
         break;
         }
@@ -2359,15 +2359,15 @@ if (jjtc000) {
     }
 }
 
-  static final public void ANDExpression() throws ParseException {/*@bgen(jjtree) ANDExpression */
+  final public void ANDExpression() throws ParseException {/*@bgen(jjtree) ANDExpression */
   ASTANDExpression jjtn000 = new ASTANDExpression(JJTANDEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       EqualityExpression();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 84:{
-        jj_consume_token(84);
+      case 85:{
+        jj_consume_token(85);
         ANDExpression();
         break;
         }
@@ -2396,24 +2396,24 @@ if (jjtc000) {
     }
 }
 
-  static final public void EqualityExpression() throws ParseException {/*@bgen(jjtree) EqualityExpression */
+  final public void EqualityExpression() throws ParseException {/*@bgen(jjtree) EqualityExpression */
   ASTEqualityExpression jjtn000 = new ASTEqualityExpression(JJTEQUALITYEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       RelationalExpression();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 85:
-      case 86:{
+      case 86:
+      case 87:{
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 85:{
-          jj_consume_token(85);
-          break;
-          }
         case 86:{
           jj_consume_token(86);
           break;
           }
+        case 87:{
+          jj_consume_token(87);
+          break;
+          }
         default:
           jj_la1[54] = jj_gen;
           jj_consume_token(-1);
@@ -2447,22 +2447,18 @@ if (jjtc000) {
     }
 }
 
-  static final public void RelationalExpression() throws ParseException {/*@bgen(jjtree) RelationalExpression */
+  final public void RelationalExpression() throws ParseException {/*@bgen(jjtree) RelationalExpression */
   ASTRelationalExpression jjtn000 = new ASTRelationalExpression(JJTRELATIONALEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       ShiftExpression();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 87:
       case 88:
       case 89:
-      case 90:{
+      case 90:
+      case 91:{
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 87:{
-          jj_consume_token(87);
-          break;
-          }
         case 88:{
           jj_consume_token(88);
           break;
@@ -2475,6 +2471,10 @@ if (jjtc000) {
           jj_consume_token(90);
           break;
           }
+        case 91:{
+          jj_consume_token(91);
+          break;
+          }
         default:
           jj_la1[56] = jj_gen;
           jj_consume_token(-1);
@@ -2508,24 +2508,24 @@ if (jjtc000) {
     }
 }
 
-  static final public void ShiftExpression() throws ParseException {/*@bgen(jjtree) ShiftExpression */
+  final public void ShiftExpression() throws ParseException {/*@bgen(jjtree) ShiftExpression */
   ASTShiftExpression jjtn000 = new ASTShiftExpression(JJTSHIFTEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       AdditiveExpression();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 91:
-      case 92:{
+      case 92:
+      case 93:{
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 91:{
-          jj_consume_token(91);
-          break;
-          }
         case 92:{
           jj_consume_token(92);
           break;
           }
+        case 93:{
+          jj_consume_token(93);
+          break;
+          }
         default:
           jj_la1[58] = jj_gen;
           jj_consume_token(-1);
@@ -2559,24 +2559,24 @@ if (jjtc000) {
     }
 }
 
-  static final public void AdditiveExpression() throws ParseException {/*@bgen(jjtree) AdditiveExpression */
+  final public void AdditiveExpression() throws ParseException {/*@bgen(jjtree) AdditiveExpression */
   ASTAdditiveExpression jjtn000 = new ASTAdditiveExpression(JJTADDITIVEEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       MultiplicativeExpression();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 93:
-      case 94:{
+      case 94:
+      case 95:{
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 93:{
-          jj_consume_token(93);
-          break;
-          }
         case 94:{
           jj_consume_token(94);
           break;
           }
+        case 95:{
+          jj_consume_token(95);
+          break;
+          }
         default:
           jj_la1[60] = jj_gen;
           jj_consume_token(-1);
@@ -2610,29 +2610,29 @@ if (jjtc000) {
     }
 }
 
-  static final public void MultiplicativeExpression() throws ParseException {/*@bgen(jjtree) MultiplicativeExpression */
+  final public void MultiplicativeExpression() throws ParseException {/*@bgen(jjtree) MultiplicativeExpression */
   ASTMultiplicativeExpression jjtn000 = new ASTMultiplicativeExpression(JJTMULTIPLICATIVEEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       CastExpression();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 64:
-      case 95:
-      case 96:{
+      case 65:
+      case 96:
+      case 97:{
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 64:{
-          jj_consume_token(64);
-          break;
-          }
-        case 95:{
-          jj_consume_token(95);
+        case 65:{
+          jj_consume_token(65);
           break;
           }
         case 96:{
           jj_consume_token(96);
           break;
           }
+        case 97:{
+          jj_consume_token(97);
+          break;
+          }
         default:
           jj_la1[62] = jj_gen;
           jj_consume_token(-1);
@@ -2666,15 +2666,15 @@ if (jjtc000) {
     }
 }
 
-  static final public void CastExpression() throws ParseException {/*@bgen(jjtree) CastExpression */
+  final public void CastExpression() throws ParseException {/*@bgen(jjtree) CastExpression */
   ASTCastExpression jjtn000 = new ASTCastExpression(JJTCASTEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       if (jj_2_19(2147483647)) {
-        jj_consume_token(60);
-        TypeName();
         jj_consume_token(61);
+        TypeName();
+        jj_consume_token(62);
         CastExpression();
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -2684,15 +2684,15 @@ if (jjtc000) {
         case STRING_LITERAL:
         case SIZEOF:
         case IDENTIFIER:
-        case 60:
-        case 64:
-        case 84:
-        case 93:
+        case 61:
+        case 65:
+        case 85:
         case 94:
-        case 97:
+        case 95:
         case 98:
         case 99:
-        case 100:{
+        case 100:
+        case 101:{
           UnaryExpression();
           break;
           }
@@ -2723,7 +2723,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void UnaryExpression() throws ParseException {/*@bgen(jjtree) UnaryExpression */
+  final public void UnaryExpression() throws ParseException {/*@bgen(jjtree) UnaryExpression */
   ASTUnaryExpression jjtn000 = new ASTUnaryExpression(JJTUNARYEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -2732,22 +2732,22 @@ if (jjtc000) {
         PostfixExpression();
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 97:{
-          jj_consume_token(97);
-          UnaryExpression();
-          break;
-          }
         case 98:{
           jj_consume_token(98);
           UnaryExpression();
           break;
           }
-        case 64:
-        case 84:
-        case 93:
+        case 99:{
+          jj_consume_token(99);
+          UnaryExpression();
+          break;
+          }
+        case 65:
+        case 85:
         case 94:
-        case 99:
-        case 100:{
+        case 95:
+        case 100:
+        case 101:{
           UnaryOperator();
           CastExpression();
           break;
@@ -2758,10 +2758,10 @@ if (jjtc000) {
             UnaryExpression();
           } else {
             switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case 60:{
-              jj_consume_token(60);
-              TypeName();
+            case 61:{
               jj_consume_token(61);
+              TypeName();
+              jj_consume_token(62);
               break;
               }
             default:
@@ -2799,36 +2799,36 @@ if (jjtc000) {
     }
 }
 
-  static final public void UnaryOperator() throws ParseException {/*@bgen(jjtree) UnaryOperator */
+  final public void UnaryOperator() throws ParseException {/*@bgen(jjtree) UnaryOperator */
   ASTUnaryOperator jjtn000 = new ASTUnaryOperator(JJTUNARYOPERATOR);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case 84:{
-        jj_consume_token(84);
+      case 85:{
+        jj_consume_token(85);
         break;
         }
-      case 64:{
-        jj_consume_token(64);
-        break;
-        }
-      case 93:{
-        jj_consume_token(93);
+      case 65:{
+        jj_consume_token(65);
         break;
         }
       case 94:{
         jj_consume_token(94);
         break;
         }
-      case 99:{
-        jj_consume_token(99);
+      case 95:{
+        jj_consume_token(95);
         break;
         }
       case 100:{
         jj_consume_token(100);
         break;
         }
+      case 101:{
+        jj_consume_token(101);
+        break;
+        }
       default:
         jj_la1[67] = jj_gen;
         jj_consume_token(-1);
@@ -2841,7 +2841,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void PostfixExpression() throws ParseException {/*@bgen(jjtree) PostfixExpression */
+  final public void PostfixExpression() throws ParseException {/*@bgen(jjtree) PostfixExpression */
   ASTPostfixExpression jjtn000 = new ASTPostfixExpression(JJTPOSTFIXEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -2850,12 +2850,12 @@ if (jjtc000) {
       label_11:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 60:
-        case 62:
-        case 97:
+        case 61:
+        case 63:
         case 98:
-        case 101:
-        case 102:{
+        case 99:
+        case 102:
+        case 103:{
           ;
           break;
           }
@@ -2864,25 +2864,20 @@ if (jjtc000) {
           break label_11;
         }
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 62:{
-          jj_consume_token(62);
-          Expression();
+        case 63:{
           jj_consume_token(63);
+          Expression();
+          jj_consume_token(64);
           break;
           }
-        case 60:{
-          jj_consume_token(60);
+        case 61:{
+          jj_consume_token(61);
           if (jj_2_22(2147483647)) {
             ArgumentExpressionList();
           } else {
             ;
           }
-          jj_consume_token(61);
-          break;
-          }
-        case 101:{
-          jj_consume_token(101);
-          Identifier();
+          jj_consume_token(62);
           break;
           }
         case 102:{
@@ -2890,14 +2885,19 @@ if (jjtc000) {
           Identifier();
           break;
           }
-        case 97:{
-          jj_consume_token(97);
+        case 103:{
+          jj_consume_token(103);
+          Identifier();
           break;
           }
         case 98:{
           jj_consume_token(98);
           break;
           }
+        case 99:{
+          jj_consume_token(99);
+          break;
+          }
         default:
           jj_la1[69] = jj_gen;
           jj_consume_token(-1);
@@ -2925,7 +2925,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void PrimaryExpression() throws ParseException {/*@bgen(jjtree) PrimaryExpression */
+  final public void PrimaryExpression() throws ParseException {/*@bgen(jjtree) PrimaryExpression */
   ASTPrimaryExpression jjtn000 = new ASTPrimaryExpression(JJTPRIMARYEXPRESSION);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -2942,10 +2942,10 @@ if (jjtc000) {
         Constant();
         break;
         }
-      case 60:{
-        jj_consume_token(60);
-        Expression();
+      case 61:{
         jj_consume_token(61);
+        Expression();
+        jj_consume_token(62);
         break;
         }
       default:
@@ -2974,7 +2974,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void ArgumentExpressionList() throws ParseException {/*@bgen(jjtree) ArgumentExpressionList */
+  final public void ArgumentExpressionList() throws ParseException {/*@bgen(jjtree) ArgumentExpressionList */
   ASTArgumentExpressionList jjtn000 = new ASTArgumentExpressionList(JJTARGUMENTEXPRESSIONLIST);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
@@ -2983,7 +2983,7 @@ if (jjtc000) {
       label_12:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case 58:{
+        case 59:{
           ;
           break;
           }
@@ -2991,7 +2991,7 @@ if (jjtc000) {
           jj_la1[71] = jj_gen;
           break label_12;
         }
-        jj_consume_token(58);
+        jj_consume_token(59);
         AssignmentExpression();
       }
     } catch (Throwable jjte000) {
@@ -3015,7 +3015,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void Identifier() throws ParseException {/*@bgen(jjtree) StringToken */
+  final public void Identifier() throws ParseException {/*@bgen(jjtree) StringToken */
         ASTStringToken jjtn000 = new ASTStringToken(JJTSTRINGTOKEN);
         boolean jjtc000 = true;
         jjtree.openNodeScope(jjtn000);Token t;
@@ -3031,7 +3031,7 @@ if (jjtc000) {
     }
 }
 
-  static final public void Constant() throws ParseException {/*@bgen(jjtree) StringToken */
+  final public void Constant() throws ParseException {/*@bgen(jjtree) StringToken */
         ASTStringToken jjtn000 = new ASTStringToken(JJTSTRINGTOKEN);
         boolean jjtc000 = true;
         jjtree.openNodeScope(jjtn000);Token t;
@@ -3068,7 +3068,7 @@ if (jjtc000) {
     }
 }
 
-  static private boolean jj_2_1(int xla)
+  private boolean jj_2_1(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_1()); }
@@ -3076,7 +3076,7 @@ if (jjtc000) {
     finally { jj_save(0, xla); }
   }
 
-  static private boolean jj_2_2(int xla)
+  private boolean jj_2_2(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_2()); }
@@ -3084,7 +3084,7 @@ if (jjtc000) {
     finally { jj_save(1, xla); }
   }
 
-  static private boolean jj_2_3(int xla)
+  private boolean jj_2_3(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_3()); }
@@ -3092,7 +3092,7 @@ if (jjtc000) {
     finally { jj_save(2, xla); }
   }
 
-  static private boolean jj_2_4(int xla)
+  private boolean jj_2_4(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_4()); }
@@ -3100,7 +3100,7 @@ if (jjtc000) {
     finally { jj_save(3, xla); }
   }
 
-  static private boolean jj_2_5(int xla)
+  private boolean jj_2_5(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_5()); }
@@ -3108,7 +3108,7 @@ if (jjtc000) {
     finally { jj_save(4, xla); }
   }
 
-  static private boolean jj_2_6(int xla)
+  private boolean jj_2_6(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_6()); }
@@ -3116,7 +3116,7 @@ if (jjtc000) {
     finally { jj_save(5, xla); }
   }
 
-  static private boolean jj_2_7(int xla)
+  private boolean jj_2_7(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_7()); }
@@ -3124,7 +3124,7 @@ if (jjtc000) {
     finally { jj_save(6, xla); }
   }
 
-  static private boolean jj_2_8(int xla)
+  private boolean jj_2_8(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_8()); }
@@ -3132,7 +3132,7 @@ if (jjtc000) {
     finally { jj_save(7, xla); }
   }
 
-  static private boolean jj_2_9(int xla)
+  private boolean jj_2_9(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_9()); }
@@ -3140,7 +3140,7 @@ if (jjtc000) {
     finally { jj_save(8, xla); }
   }
 
-  static private boolean jj_2_10(int xla)
+  private boolean jj_2_10(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_10()); }
@@ -3148,7 +3148,7 @@ if (jjtc000) {
     finally { jj_save(9, xla); }
   }
 
-  static private boolean jj_2_11(int xla)
+  private boolean jj_2_11(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_11()); }
@@ -3156,7 +3156,7 @@ if (jjtc000) {
     finally { jj_save(10, xla); }
   }
 
-  static private boolean jj_2_12(int xla)
+  private boolean jj_2_12(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_12()); }
@@ -3164,7 +3164,7 @@ if (jjtc000) {
     finally { jj_save(11, xla); }
   }
 
-  static private boolean jj_2_13(int xla)
+  private boolean jj_2_13(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_13()); }
@@ -3172,7 +3172,7 @@ if (jjtc000) {
     finally { jj_save(12, xla); }
   }
 
-  static private boolean jj_2_14(int xla)
+  private boolean jj_2_14(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_14()); }
@@ -3180,7 +3180,7 @@ if (jjtc000) {
     finally { jj_save(13, xla); }
   }
 
-  static private boolean jj_2_15(int xla)
+  private boolean jj_2_15(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_15()); }
@@ -3188,7 +3188,7 @@ if (jjtc000) {
     finally { jj_save(14, xla); }
   }
 
-  static private boolean jj_2_16(int xla)
+  private boolean jj_2_16(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_16()); }
@@ -3196,7 +3196,7 @@ if (jjtc000) {
     finally { jj_save(15, xla); }
   }
 
-  static private boolean jj_2_17(int xla)
+  private boolean jj_2_17(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_17()); }
@@ -3204,7 +3204,7 @@ if (jjtc000) {
     finally { jj_save(16, xla); }
   }
 
-  static private boolean jj_2_18(int xla)
+  private boolean jj_2_18(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_18()); }
@@ -3212,7 +3212,7 @@ if (jjtc000) {
     finally { jj_save(17, xla); }
   }
 
-  static private boolean jj_2_19(int xla)
+  private boolean jj_2_19(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_19()); }
@@ -3220,7 +3220,7 @@ if (jjtc000) {
     finally { jj_save(18, xla); }
   }
 
-  static private boolean jj_2_20(int xla)
+  private boolean jj_2_20(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_20()); }
@@ -3228,7 +3228,7 @@ if (jjtc000) {
     finally { jj_save(19, xla); }
   }
 
-  static private boolean jj_2_21(int xla)
+  private boolean jj_2_21(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_21()); }
@@ -3236,7 +3236,7 @@ if (jjtc000) {
     finally { jj_save(20, xla); }
   }
 
-  static private boolean jj_2_22(int xla)
+  private boolean jj_2_22(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     try { return (!jj_3_22()); }
@@ -3244,67 +3244,56 @@ if (jjtc000) {
     finally { jj_save(21, xla); }
   }
 
-  static private boolean jj_3R_LogicalANDExpression_372_9_93()
+  private boolean jj_3R_LogicalORExpression_369_9_59()
  {
-    if (jj_3R_InclusiveORExpression_377_9_123()) return true;
+    if (jj_3R_LogicalANDExpression_374_9_93()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_LogicalANDExpression_372_35_124()) jj_scanpos = xsp;
+    if (jj_3R_LogicalORExpression_369_34_94()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_LogicalORExpression_367_9_59()
+  private boolean jj_3R_Expression_343_34_140()
  {
-    if (jj_3R_LogicalANDExpression_372_9_93()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_LogicalORExpression_367_34_94()) jj_scanpos = xsp;
+    if (jj_scan_token(59)) return true;
+    if (jj_3R_AssignmentExpression_348_9_66()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Expression_341_34_140()
- {
-    if (jj_scan_token(58)) return true;
-    if (jj_3R_AssignmentExpression_346_9_66()) return true;
-    return false;
-  }
-
-  static private boolean jj_3_16()
+  private boolean jj_3_16()
  {
     if (jj_scan_token(ELSE)) return true;
-    if (jj_3R_Statement_286_9_24()) return true;
+    if (jj_3R_Statement_288_9_24()) return true;
     return false;
   }
 
-  static private boolean jj_3R_ConstantExpression_362_9_84()
+  private boolean jj_3R_ConstantExpression_364_9_84()
  {
-    if (jj_3R_ConditionalExpression_357_9_27()) return true;
+    if (jj_3R_ConditionalExpression_359_9_27()) return true;
     return false;
   }
 
-  static private boolean jj_3R_ConditionalExpression_357_9_27()
+  private boolean jj_3R_ConditionalExpression_359_9_27()
  {
-    if (jj_3R_LogicalORExpression_367_9_59()) return true;
+    if (jj_3R_LogicalORExpression_369_9_59()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_ConditionalExpression_357_33_60()) jj_scanpos = xsp;
+    if (jj_3R_ConditionalExpression_359_33_60()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3_17()
+  private boolean jj_3_17()
  {
-    if (jj_3R_UnaryExpression_423_9_25()) return true;
-    if (jj_3R_AssignmentOperator_352_9_26()) return true;
+    if (jj_3R_UnaryExpression_425_9_25()) return true;
+    if (jj_3R_AssignmentOperator_354_9_26()) return true;
     return false;
   }
 
-  static private boolean jj_3R_AssignmentOperator_352_9_26()
+  private boolean jj_3R_AssignmentOperator_354_9_26()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(59)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(69)) {
+    if (jj_scan_token(60)) {
     jj_scanpos = xsp;
     if (jj_scan_token(70)) {
     jj_scanpos = xsp;
@@ -3322,7 +3311,9 @@ if (jjtc000) {
     jj_scanpos = xsp;
     if (jj_scan_token(77)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(78)) return true;
+    if (jj_scan_token(78)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(79)) return true;
     }
     }
     }
@@ -3336,304 +3327,304 @@ if (jjtc000) {
     return false;
   }
 
-  static private boolean jj_3_18()
+  private boolean jj_3_18()
  {
-    if (jj_3R_ConditionalExpression_357_9_27()) return true;
+    if (jj_3R_ConditionalExpression_359_9_27()) return true;
     return false;
   }
 
-  static private boolean jj_3R_AssignmentExpression_346_9_66()
+  private boolean jj_3R_AssignmentExpression_348_9_66()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_AssignmentExpression_346_9_103()) {
+    if (jj_3R_AssignmentExpression_348_9_103()) {
     jj_scanpos = xsp;
     if (jj_3_18()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_AssignmentExpression_346_9_103()
+  private boolean jj_3R_AssignmentExpression_348_9_103()
  {
-    if (jj_3R_UnaryExpression_423_9_25()) return true;
-    if (jj_3R_AssignmentOperator_352_9_26()) return true;
-    if (jj_3R_AssignmentExpression_346_9_66()) return true;
+    if (jj_3R_UnaryExpression_425_9_25()) return true;
+    if (jj_3R_AssignmentOperator_354_9_26()) return true;
+    if (jj_3R_AssignmentExpression_348_9_66()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Expression_341_9_95()
+  private boolean jj_3R_Expression_343_9_95()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_Expression_341_9_125()) {
+    if (jj_3R_Expression_343_9_125()) {
     jj_scanpos = xsp;
-    if (jj_3R_Expression_341_66_126()) return true;
+    if (jj_3R_Expression_343_66_126()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_Expression_341_9_125()
+  private boolean jj_3R_Expression_343_9_125()
  {
-    if (jj_3R_AssignmentExpression_346_9_66()) return true;
+    if (jj_3R_AssignmentExpression_348_9_66()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_Expression_341_34_140()) { jj_scanpos = xsp; break; }
+      if (jj_3R_Expression_343_34_140()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_JumpStatement_336_9_122()
+  private boolean jj_3R_JumpStatement_338_9_122()
  {
     if (jj_scan_token(RETURN)) return true;
     return false;
   }
 
-  static private boolean jj_3R_JumpStatement_333_11_119()
+  private boolean jj_3R_JumpStatement_335_11_119()
  {
     if (jj_scan_token(GOTO)) return true;
     return false;
   }
 
-  static private boolean jj_3R_JumpStatement_335_9_121()
+  private boolean jj_3R_JumpStatement_337_9_121()
  {
     if (jj_scan_token(BREAK)) return true;
     return false;
   }
 
-  static private boolean jj_3R_JumpStatement_334_9_120()
+  private boolean jj_3R_JumpStatement_336_9_120()
  {
     if (jj_scan_token(CONTINUE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_JumpStatement_333_9_89()
+  private boolean jj_3R_JumpStatement_335_9_89()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_JumpStatement_333_11_119()) {
+    if (jj_3R_JumpStatement_335_11_119()) {
     jj_scanpos = xsp;
-    if (jj_3R_JumpStatement_334_9_120()) {
+    if (jj_3R_JumpStatement_336_9_120()) {
     jj_scanpos = xsp;
-    if (jj_3R_JumpStatement_335_9_121()) {
+    if (jj_3R_JumpStatement_337_9_121()) {
     jj_scanpos = xsp;
-    if (jj_3R_JumpStatement_336_9_122()) return true;
+    if (jj_3R_JumpStatement_338_9_122()) return true;
     }
     }
     }
     return false;
   }
 
-  static private boolean jj_3R_IterationStatement_326_11_116()
+  private boolean jj_3R_IterationStatement_328_11_116()
  {
     if (jj_scan_token(WHILE)) return true;
     return false;
   }
 
-  static private boolean jj_3R_IterationStatement_328_9_118()
+  private boolean jj_3R_IterationStatement_330_9_118()
  {
     if (jj_scan_token(FOR)) return true;
     return false;
   }
 
-  static private boolean jj_3R_IterationStatement_327_9_117()
+  private boolean jj_3R_IterationStatement_329_9_117()
  {
     if (jj_scan_token(DO)) return true;
     return false;
   }
 
-  static private boolean jj_3R_IterationStatement_326_9_88()
+  private boolean jj_3R_IterationStatement_328_9_88()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_IterationStatement_326_11_116()) {
+    if (jj_3R_IterationStatement_328_11_116()) {
     jj_scanpos = xsp;
-    if (jj_3R_IterationStatement_327_9_117()) {
+    if (jj_3R_IterationStatement_329_9_117()) {
     jj_scanpos = xsp;
-    if (jj_3R_IterationStatement_328_9_118()) return true;
+    if (jj_3R_IterationStatement_330_9_118()) return true;
     }
     }
     return false;
   }
 
-  static private boolean jj_3R_DirectAbstractDeclarator_281_52_152()
+  private boolean jj_3R_DirectAbstractDeclarator_283_52_152()
  {
-    if (jj_3R_ParameterTypeList_234_9_16()) return true;
+    if (jj_3R_ParameterTypeList_236_9_16()) return true;
     return false;
   }
 
-  static private boolean jj_3_15()
+  private boolean jj_3_15()
  {
-    if (jj_3R_DeclarationList_144_9_23()) return true;
+    if (jj_3R_DeclarationList_146_9_23()) return true;
     return false;
   }
 
-  static private boolean jj_3R_SelectionStatement_320_11_114()
+  private boolean jj_3R_SelectionStatement_322_11_114()
  {
     if (jj_scan_token(IF)) return true;
     return false;
   }
 
-  static private boolean jj_3R_SelectionStatement_321_9_115()
+  private boolean jj_3R_SelectionStatement_323_9_115()
  {
     if (jj_scan_token(SWITCH)) return true;
     return false;
   }
 
-  static private boolean jj_3R_SelectionStatement_320_9_87()
+  private boolean jj_3R_SelectionStatement_322_9_87()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_SelectionStatement_320_11_114()) {
+    if (jj_3R_SelectionStatement_322_11_114()) {
     jj_scanpos = xsp;
-    if (jj_3R_SelectionStatement_321_9_115()) return true;
+    if (jj_3R_SelectionStatement_323_9_115()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_DirectAbstractDeclarator_281_46_147()
+  private boolean jj_3R_DirectAbstractDeclarator_283_46_147()
  {
-    if (jj_scan_token(60)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_DirectAbstractDeclarator_281_52_152()) jj_scanpos = xsp;
     if (jj_scan_token(61)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_DirectAbstractDeclarator_283_52_152()) jj_scanpos = xsp;
+    if (jj_scan_token(62)) return true;
     return false;
   }
 
-  static private boolean jj_3R_ParameterDeclaration_244_76_130()
+  private boolean jj_3R_ParameterDeclaration_246_76_130()
  {
-    if (jj_3R_AbstractDeclarator_271_9_21()) return true;
+    if (jj_3R_AbstractDeclarator_273_9_21()) return true;
     return false;
   }
 
-  static private boolean jj_3R_ParameterDeclaration_244_74_107()
+  private boolean jj_3R_ParameterDeclaration_246_74_107()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_ParameterDeclaration_244_76_130()) jj_scanpos = xsp;
+    if (jj_3R_ParameterDeclaration_246_76_130()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_CompoundStatement_308_9_86()
+  private boolean jj_3R_CompoundStatement_310_9_86()
  {
-    if (jj_scan_token(66)) return true;
+    if (jj_scan_token(67)) return true;
     return false;
   }
 
-  static private boolean jj_3R_ExpressionStatement_303_11_113()
+  private boolean jj_3R_ExpressionStatement_305_11_113()
  {
-    if (jj_3R_Expression_341_9_95()) return true;
+    if (jj_3R_Expression_343_9_95()) return true;
     return false;
   }
 
-  static private boolean jj_3R_ExpressionStatement_303_9_85()
+  private boolean jj_3R_ExpressionStatement_305_9_85()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_ExpressionStatement_303_11_113()) jj_scanpos = xsp;
-    if (jj_scan_token(57)) return true;
+    if (jj_3R_ExpressionStatement_305_11_113()) jj_scanpos = xsp;
+    if (jj_scan_token(58)) return true;
     return false;
   }
 
-  static private boolean jj_3R_LabeledStatement_298_9_48()
+  private boolean jj_3R_LabeledStatement_300_9_48()
  {
     if (jj_scan_token(DFLT)) return true;
-    if (jj_scan_token(68)) return true;
+    if (jj_scan_token(69)) return true;
     return false;
   }
 
-  static private boolean jj_3R_LabeledStatement_296_11_46()
+  private boolean jj_3R_LabeledStatement_298_11_46()
  {
-    if (jj_3R_Identifier_462_9_83()) return true;
-    if (jj_scan_token(68)) return true;
+    if (jj_3R_Identifier_464_9_83()) return true;
+    if (jj_scan_token(69)) return true;
     return false;
   }
 
-  static private boolean jj_3R_LabeledStatement_297_9_47()
+  private boolean jj_3R_LabeledStatement_299_9_47()
  {
     if (jj_scan_token(CASE)) return true;
-    if (jj_3R_ConstantExpression_362_9_84()) return true;
+    if (jj_3R_ConstantExpression_364_9_84()) return true;
     return false;
   }
 
-  static private boolean jj_3R_LabeledStatement_296_9_22()
+  private boolean jj_3R_LabeledStatement_298_9_22()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_LabeledStatement_296_11_46()) {
+    if (jj_3R_LabeledStatement_298_11_46()) {
     jj_scanpos = xsp;
-    if (jj_3R_LabeledStatement_297_9_47()) {
+    if (jj_3R_LabeledStatement_299_9_47()) {
     jj_scanpos = xsp;
-    if (jj_3R_LabeledStatement_298_9_48()) return true;
+    if (jj_3R_LabeledStatement_300_9_48()) return true;
     }
     }
     return false;
   }
 
-  static private boolean jj_3R_TypeName_265_36_61()
+  private boolean jj_3R_TypeName_267_36_61()
  {
-    if (jj_3R_AbstractDeclarator_271_9_21()) return true;
+    if (jj_3R_AbstractDeclarator_273_9_21()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Statement_291_9_54()
+  private boolean jj_3R_Statement_293_9_54()
  {
-    if (jj_3R_JumpStatement_333_9_89()) return true;
+    if (jj_3R_JumpStatement_335_9_89()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Statement_290_9_53()
+  private boolean jj_3R_Statement_292_9_53()
  {
-    if (jj_3R_IterationStatement_326_9_88()) return true;
+    if (jj_3R_IterationStatement_328_9_88()) return true;
     return false;
   }
 
-  static private boolean jj_3R_DirectAbstractDeclarator_281_17_151()
+  private boolean jj_3R_DirectAbstractDeclarator_283_17_151()
  {
-    if (jj_3R_ConstantExpression_362_9_84()) return true;
+    if (jj_3R_ConstantExpression_364_9_84()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Statement_289_9_52()
+  private boolean jj_3R_Statement_291_9_52()
  {
-    if (jj_3R_SelectionStatement_320_9_87()) return true;
+    if (jj_3R_SelectionStatement_322_9_87()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Statement_288_9_51()
+  private boolean jj_3R_Statement_290_9_51()
  {
-    if (jj_3R_CompoundStatement_308_9_86()) return true;
+    if (jj_3R_CompoundStatement_310_9_86()) return true;
     return false;
   }
 
-  static private boolean jj_3_14()
+  private boolean jj_3_14()
  {
-    if (jj_3R_LabeledStatement_296_9_22()) return true;
+    if (jj_3R_LabeledStatement_298_9_22()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Statement_287_9_50()
+  private boolean jj_3R_Statement_289_9_50()
  {
-    if (jj_3R_ExpressionStatement_303_9_85()) return true;
+    if (jj_3R_ExpressionStatement_305_9_85()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Statement_286_9_24()
+  private boolean jj_3R_Statement_288_9_24()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_14()) {
     jj_scanpos = xsp;
-    if (jj_3R_Statement_287_9_50()) {
+    if (jj_3R_Statement_289_9_50()) {
     jj_scanpos = xsp;
-    if (jj_3R_Statement_288_9_51()) {
+    if (jj_3R_Statement_290_9_51()) {
     jj_scanpos = xsp;
-    if (jj_3R_Statement_289_9_52()) {
+    if (jj_3R_Statement_291_9_52()) {
     jj_scanpos = xsp;
-    if (jj_3R_Statement_290_9_53()) {
+    if (jj_3R_Statement_292_9_53()) {
     jj_scanpos = xsp;
-    if (jj_3R_Statement_291_9_54()) return true;
+    if (jj_3R_Statement_293_9_54()) return true;
     }
     }
     }
@@ -3642,162 +3633,162 @@ if (jjtc000) {
     return false;
   }
 
-  static private boolean jj_3R_DirectAbstractDeclarator_279_14_145()
+  private boolean jj_3R_DirectAbstractDeclarator_281_14_145()
  {
-    if (jj_3R_ParameterTypeList_234_9_16()) return true;
+    if (jj_3R_ParameterTypeList_236_9_16()) return true;
     return false;
   }
 
-  static private boolean jj_3R_DirectAbstractDeclarator_281_11_146()
+  private boolean jj_3R_DirectAbstractDeclarator_283_11_146()
  {
-    if (jj_scan_token(62)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_DirectAbstractDeclarator_281_17_151()) jj_scanpos = xsp;
     if (jj_scan_token(63)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_DirectAbstractDeclarator_283_17_151()) jj_scanpos = xsp;
+    if (jj_scan_token(64)) return true;
     return false;
   }
 
-  static private boolean jj_3R_DirectAbstractDeclarator_278_14_144()
+  private boolean jj_3R_DirectAbstractDeclarator_280_14_144()
  {
-    if (jj_3R_ConstantExpression_362_9_84()) return true;
+    if (jj_3R_ConstantExpression_364_9_84()) return true;
     return false;
   }
 
-  static private boolean jj_3R_DirectAbstractDeclarator_281_11_139()
+  private boolean jj_3R_DirectAbstractDeclarator_283_11_139()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_DirectAbstractDeclarator_281_11_146()) {
+    if (jj_3R_DirectAbstractDeclarator_283_11_146()) {
     jj_scanpos = xsp;
-    if (jj_3R_DirectAbstractDeclarator_281_46_147()) return true;
+    if (jj_3R_DirectAbstractDeclarator_283_46_147()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3_10()
+  private boolean jj_3_10()
  {
-    if (jj_3R_Declarator_211_9_18()) return true;
+    if (jj_3R_Declarator_213_9_18()) return true;
     return false;
   }
 
-  static private boolean jj_3_13()
+  private boolean jj_3_13()
  {
-    if (jj_scan_token(60)) return true;
-    if (jj_3R_AbstractDeclarator_271_9_21()) return true;
     if (jj_scan_token(61)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_DirectAbstractDeclarator_279_9_112()
- {
-    if (jj_scan_token(60)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_DirectAbstractDeclarator_279_14_145()) jj_scanpos = xsp;
-    if (jj_scan_token(61)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_DirectAbstractDeclarator_278_9_111()
- {
+    if (jj_3R_AbstractDeclarator_273_9_21()) return true;
     if (jj_scan_token(62)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_DirectAbstractDeclarator_278_14_144()) jj_scanpos = xsp;
-    if (jj_scan_token(63)) return true;
     return false;
   }
 
-  static private boolean jj_3R_DirectAbstractDeclarator_277_9_82()
+  private boolean jj_3R_DirectAbstractDeclarator_281_9_112()
+ {
+    if (jj_scan_token(61)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_DirectAbstractDeclarator_281_14_145()) jj_scanpos = xsp;
+    if (jj_scan_token(62)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_DirectAbstractDeclarator_280_9_111()
+ {
+    if (jj_scan_token(63)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_DirectAbstractDeclarator_280_14_144()) jj_scanpos = xsp;
+    if (jj_scan_token(64)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_DirectAbstractDeclarator_279_9_82()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_13()) {
     jj_scanpos = xsp;
-    if (jj_3R_DirectAbstractDeclarator_278_9_111()) {
+    if (jj_3R_DirectAbstractDeclarator_280_9_111()) {
     jj_scanpos = xsp;
-    if (jj_3R_DirectAbstractDeclarator_279_9_112()) return true;
+    if (jj_3R_DirectAbstractDeclarator_281_9_112()) return true;
     }
     }
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_DirectAbstractDeclarator_281_11_139()) { jj_scanpos = xsp; break; }
+      if (jj_3R_DirectAbstractDeclarator_283_11_139()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3_11()
+  private boolean jj_3_11()
  {
-    if (jj_scan_token(58)) return true;
-    if (jj_3R_Initializer_254_9_19()) return true;
+    if (jj_scan_token(59)) return true;
+    if (jj_3R_Initializer_256_9_19()) return true;
     return false;
   }
 
-  static private boolean jj_3_12()
+  private boolean jj_3_12()
  {
-    if (jj_3R_Pointer_224_9_20()) return true;
+    if (jj_3R_Pointer_226_9_20()) return true;
     return false;
   }
 
-  static private boolean jj_3R_AbstractDeclarator_272_10_81()
+  private boolean jj_3R_AbstractDeclarator_274_10_81()
  {
-    if (jj_3R_Pointer_224_9_20()) return true;
+    if (jj_3R_Pointer_226_9_20()) return true;
     return false;
   }
 
-  static private boolean jj_3R_AbstractDeclarator_272_9_45()
+  private boolean jj_3R_AbstractDeclarator_274_9_45()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_AbstractDeclarator_272_10_81()) jj_scanpos = xsp;
-    if (jj_3R_DirectAbstractDeclarator_277_9_82()) return true;
+    if (jj_3R_AbstractDeclarator_274_10_81()) jj_scanpos = xsp;
+    if (jj_3R_DirectAbstractDeclarator_279_9_82()) return true;
     return false;
   }
 
-  static private boolean jj_3R_AbstractDeclarator_271_9_21()
+  private boolean jj_3R_AbstractDeclarator_273_9_21()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_12()) {
     jj_scanpos = xsp;
-    if (jj_3R_AbstractDeclarator_272_9_45()) return true;
+    if (jj_3R_AbstractDeclarator_274_9_45()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_ParameterDeclaration_244_35_106()
+  private boolean jj_3R_ParameterDeclaration_246_35_106()
  {
-    if (jj_3R_Declarator_211_9_18()) return true;
+    if (jj_3R_Declarator_213_9_18()) return true;
     return false;
   }
 
-  static private boolean jj_3R_TypeName_265_9_28()
+  private boolean jj_3R_TypeName_267_9_28()
  {
-    if (jj_3R_SpecifierQualifierList_203_9_15()) return true;
+    if (jj_3R_SpecifierQualifierList_205_9_15()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_TypeName_265_36_61()) jj_scanpos = xsp;
+    if (jj_3R_TypeName_267_36_61()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_IdentifierList_249_23_141()
+  private boolean jj_3R_IdentifierList_251_23_141()
  {
-    if (jj_scan_token(58)) return true;
-    if (jj_3R_Identifier_462_9_83()) return true;
+    if (jj_scan_token(59)) return true;
+    if (jj_3R_Identifier_464_9_83()) return true;
     return false;
   }
 
-  static private boolean jj_3_9()
+  private boolean jj_3_9()
  {
-    if (jj_scan_token(58)) return true;
-    if (jj_3R_ParameterDeclaration_244_9_17()) return true;
+    if (jj_scan_token(59)) return true;
+    if (jj_3R_ParameterDeclaration_246_9_17()) return true;
     return false;
   }
 
-  static private boolean jj_3R_InitializerList_260_9_148()
+  private boolean jj_3R_InitializerList_262_9_148()
  {
-    if (jj_3R_Initializer_254_9_19()) return true;
+    if (jj_3R_Initializer_256_9_19()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
@@ -3806,73 +3797,73 @@ if (jjtc000) {
     return false;
   }
 
-  static private boolean jj_3R_Initializer_254_11_41()
+  private boolean jj_3R_Initializer_256_11_41()
  {
-    if (jj_3R_AssignmentExpression_346_9_66()) return true;
+    if (jj_3R_AssignmentExpression_348_9_66()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Initializer_255_9_42()
+  private boolean jj_3R_Initializer_257_9_42()
  {
-    if (jj_scan_token(66)) return true;
-    if (jj_3R_InitializerList_260_9_148()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(58)) jj_scanpos = xsp;
     if (jj_scan_token(67)) return true;
+    if (jj_3R_InitializerList_262_9_148()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(59)) jj_scanpos = xsp;
+    if (jj_scan_token(68)) return true;
     return false;
   }
 
-  static private boolean jj_3R_Pointer_224_39_44()
+  private boolean jj_3R_Pointer_226_39_44()
  {
-    if (jj_3R_Pointer_224_9_20()) return true;
+    if (jj_3R_Pointer_226_9_20()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Initializer_254_9_19()
+  private boolean jj_3R_Initializer_256_9_19()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_Initializer_254_11_41()) {
+    if (jj_3R_Initializer_256_11_41()) {
     jj_scanpos = xsp;
-    if (jj_3R_Initializer_255_9_42()) return true;
+    if (jj_3R_Initializer_257_9_42()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_ParameterTypeList_234_26_135()
+  private boolean jj_3R_ParameterTypeList_236_26_135()
  {
-    if (jj_scan_token(58)) return true;
-    if (jj_scan_token(65)) return true;
+    if (jj_scan_token(59)) return true;
+    if (jj_scan_token(66)) return true;
     return false;
   }
 
-  static private boolean jj_3R_IdentifierList_249_9_136()
+  private boolean jj_3R_IdentifierList_251_9_136()
  {
-    if (jj_3R_Identifier_462_9_83()) return true;
+    if (jj_3R_Identifier_464_9_83()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_IdentifierList_249_23_141()) { jj_scanpos = xsp; break; }
+      if (jj_3R_IdentifierList_251_23_141()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_ParameterDeclaration_244_9_17()
+  private boolean jj_3R_ParameterDeclaration_246_9_17()
  {
-    if (jj_3R_DeclarationSpecifiers_149_9_13()) return true;
+    if (jj_3R_DeclarationSpecifiers_151_9_13()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_ParameterDeclaration_244_35_106()) {
+    if (jj_3R_ParameterDeclaration_246_35_106()) {
     jj_scanpos = xsp;
-    if (jj_3R_ParameterDeclaration_244_74_107()) return true;
+    if (jj_3R_ParameterDeclaration_246_74_107()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_ParameterList_239_9_38()
+  private boolean jj_3R_ParameterList_241_9_38()
  {
-    if (jj_3R_ParameterDeclaration_244_9_17()) return true;
+    if (jj_3R_ParameterDeclaration_246_9_17()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
@@ -3881,241 +3872,241 @@ if (jjtc000) {
     return false;
   }
 
-  static private boolean jj_3R_ParameterTypeList_234_9_16()
+  private boolean jj_3R_ParameterTypeList_236_9_16()
  {
-    if (jj_3R_ParameterList_239_9_38()) return true;
+    if (jj_3R_ParameterList_241_9_38()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_ParameterTypeList_234_26_135()) jj_scanpos = xsp;
+    if (jj_3R_ParameterTypeList_236_26_135()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3_7()
+  private boolean jj_3_7()
  {
-    if (jj_3R_SpecifierQualifierList_203_9_15()) return true;
+    if (jj_3R_SpecifierQualifierList_205_9_15()) return true;
     return false;
   }
 
-  static private boolean jj_3R_DirectDeclarator_216_26_78()
+  private boolean jj_3R_DirectDeclarator_218_26_78()
  {
-    if (jj_scan_token(60)) return true;
-    if (jj_3R_Declarator_211_9_18()) return true;
     if (jj_scan_token(61)) return true;
+    if (jj_3R_Declarator_213_9_18()) return true;
+    if (jj_scan_token(62)) return true;
     return false;
   }
 
-  static private boolean jj_3_6()
+  private boolean jj_3_6()
  {
-    if (jj_3R_SpecifierQualifierList_203_9_15()) return true;
+    if (jj_3R_SpecifierQualifierList_205_9_15()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Pointer_224_15_43()
+  private boolean jj_3R_Pointer_226_15_43()
  {
-    if (jj_3R_TypeQualifierList_229_9_80()) return true;
+    if (jj_3R_TypeQualifierList_231_9_80()) return true;
     return false;
   }
 
-  static private boolean jj_3R_TypeQualifierList_229_10_110()
+  private boolean jj_3R_TypeQualifierList_231_10_110()
  {
-    if (jj_3R_TypeQualifier_185_9_72()) return true;
+    if (jj_3R_TypeQualifier_187_9_72()) return true;
     return false;
   }
 
-  static private boolean jj_3R_TypeQualifierList_229_9_80()
+  private boolean jj_3R_TypeQualifierList_231_9_80()
  {
     Token xsp;
-    if (jj_3R_TypeQualifierList_229_10_110()) return true;
+    if (jj_3R_TypeQualifierList_231_10_110()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_TypeQualifierList_229_10_110()) { jj_scanpos = xsp; break; }
+      if (jj_3R_TypeQualifierList_231_10_110()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_DirectDeclarator_217_17_131()
+  private boolean jj_3R_DirectDeclarator_219_17_131()
  {
-    if (jj_3R_ConstantExpression_362_9_84()) return true;
+    if (jj_3R_ConstantExpression_364_9_84()) return true;
     return false;
   }
 
-  static private boolean jj_3R_DirectDeclarator_219_15_132()
+  private boolean jj_3R_DirectDeclarator_221_15_132()
  {
-    if (jj_3R_IdentifierList_249_9_136()) return true;
+    if (jj_3R_IdentifierList_251_9_136()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Pointer_224_9_20()
+  private boolean jj_3R_Pointer_226_9_20()
  {
-    if (jj_scan_token(64)) return true;
+    if (jj_scan_token(65)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_Pointer_224_15_43()) jj_scanpos = xsp;
+    if (jj_3R_Pointer_226_15_43()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_Pointer_224_39_44()) jj_scanpos = xsp;
+    if (jj_3R_Pointer_226_39_44()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_SpecifierQualifierList_205_27_76()
+  private boolean jj_3R_SpecifierQualifierList_207_27_76()
  {
-    if (jj_3R_SpecifierQualifierList_203_9_15()) return true;
+    if (jj_3R_SpecifierQualifierList_205_9_15()) return true;
     return false;
   }
 
-  static private boolean jj_3R_SpecifierQualifierList_203_27_75()
+  private boolean jj_3R_SpecifierQualifierList_205_27_75()
  {
-    if (jj_3R_SpecifierQualifierList_203_9_15()) return true;
+    if (jj_3R_SpecifierQualifierList_205_9_15()) return true;
     return false;
   }
 
-  static private boolean jj_3R_DirectDeclarator_217_11_79()
+  private boolean jj_3R_DirectDeclarator_219_11_79()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_DirectDeclarator_217_11_108()) {
+    if (jj_3R_DirectDeclarator_219_11_108()) {
     jj_scanpos = xsp;
     if (jj_3_8()) {
     jj_scanpos = xsp;
-    if (jj_3R_DirectDeclarator_219_9_109()) return true;
+    if (jj_3R_DirectDeclarator_221_9_109()) return true;
     }
     }
     return false;
   }
 
-  static private boolean jj_3R_DirectDeclarator_217_11_108()
+  private boolean jj_3R_DirectDeclarator_219_11_108()
  {
-    if (jj_scan_token(62)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_DirectDeclarator_217_17_131()) jj_scanpos = xsp;
     if (jj_scan_token(63)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_DirectDeclarator_219_9_109()
- {
-    if (jj_scan_token(60)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_DirectDeclarator_219_15_132()) jj_scanpos = xsp;
-    if (jj_scan_token(61)) return true;
+    if (jj_3R_DirectDeclarator_219_17_131()) jj_scanpos = xsp;
+    if (jj_scan_token(64)) return true;
     return false;
   }
 
-  static private boolean jj_3_8()
+  private boolean jj_3R_DirectDeclarator_221_9_109()
  {
-    if (jj_scan_token(60)) return true;
-    if (jj_3R_ParameterTypeList_234_9_16()) return true;
     if (jj_scan_token(61)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_DirectDeclarator_221_15_132()) jj_scanpos = xsp;
+    if (jj_scan_token(62)) return true;
     return false;
   }
 
-  static private boolean jj_3R_DirectDeclarator_216_11_77()
+  private boolean jj_3_8()
  {
-    if (jj_3R_Identifier_462_9_83()) return true;
+    if (jj_scan_token(61)) return true;
+    if (jj_3R_ParameterTypeList_236_9_16()) return true;
+    if (jj_scan_token(62)) return true;
     return false;
   }
 
-  static private boolean jj_3R_DirectDeclarator_216_9_40()
+  private boolean jj_3R_DirectDeclarator_218_11_77()
+ {
+    if (jj_3R_Identifier_464_9_83()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_DirectDeclarator_218_9_40()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_DirectDeclarator_216_11_77()) {
+    if (jj_3R_DirectDeclarator_218_11_77()) {
     jj_scanpos = xsp;
-    if (jj_3R_DirectDeclarator_216_26_78()) return true;
+    if (jj_3R_DirectDeclarator_218_26_78()) return true;
     }
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_DirectDeclarator_217_11_79()) { jj_scanpos = xsp; break; }
+      if (jj_3R_DirectDeclarator_219_11_79()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_Declarator_211_11_39()
+  private boolean jj_3R_Declarator_213_11_39()
  {
-    if (jj_3R_Pointer_224_9_20()) return true;
+    if (jj_3R_Pointer_226_9_20()) return true;
     return false;
   }
 
-  static private boolean jj_3R_InitDeclarator_198_24_129()
+  private boolean jj_3R_InitDeclarator_200_24_129()
+ {
+    if (jj_scan_token(60)) return true;
+    if (jj_3R_Initializer_256_9_19()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_Declarator_213_9_18()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_Declarator_213_11_39()) jj_scanpos = xsp;
+    if (jj_3R_DirectDeclarator_218_9_40()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_InitDeclaratorList_195_27_105()
  {
     if (jj_scan_token(59)) return true;
-    if (jj_3R_Initializer_254_9_19()) return true;
+    if (jj_3R_InitDeclarator_200_9_104()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Declarator_211_9_18()
+  private boolean jj_3R_SpecifierQualifierList_207_9_37()
+ {
+    if (jj_3R_TypeQualifier_187_9_72()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_SpecifierQualifierList_207_27_76()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_SpecifierQualifierList_205_9_36()
+ {
+    if (jj_3R_TypeSpecifier_175_9_70()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_SpecifierQualifierList_205_27_75()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_SpecifierQualifierList_205_9_15()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_Declarator_211_11_39()) jj_scanpos = xsp;
-    if (jj_3R_DirectDeclarator_216_9_40()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_InitDeclaratorList_193_27_105()
- {
-    if (jj_scan_token(58)) return true;
-    if (jj_3R_InitDeclarator_198_9_104()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_SpecifierQualifierList_205_9_37()
- {
-    if (jj_3R_TypeQualifier_185_9_72()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_SpecifierQualifierList_205_27_76()) jj_scanpos = xsp;
-    return false;
-  }
-
-  static private boolean jj_3R_SpecifierQualifierList_203_9_36()
- {
-    if (jj_3R_TypeSpecifier_173_9_70()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_SpecifierQualifierList_203_27_75()) jj_scanpos = xsp;
-    return false;
-  }
-
-  static private boolean jj_3R_SpecifierQualifierList_203_9_15()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_SpecifierQualifierList_203_9_36()) {
+    if (jj_3R_SpecifierQualifierList_205_9_36()) {
     jj_scanpos = xsp;
-    if (jj_3R_SpecifierQualifierList_205_9_37()) return true;
+    if (jj_3R_SpecifierQualifierList_207_9_37()) return true;
     }
     return false;
   }
 
-  static private boolean jj_3R_InitDeclarator_198_9_104()
+  private boolean jj_3R_InitDeclarator_200_9_104()
  {
-    if (jj_3R_Declarator_211_9_18()) return true;
+    if (jj_3R_Declarator_213_9_18()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_InitDeclarator_198_24_129()) jj_scanpos = xsp;
+    if (jj_3R_InitDeclarator_200_24_129()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_InitDeclaratorList_193_9_74()
+  private boolean jj_3R_InitDeclaratorList_195_9_74()
  {
-    if (jj_3R_InitDeclarator_198_9_104()) return true;
+    if (jj_3R_InitDeclarator_200_9_104()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_InitDeclaratorList_193_27_105()) { jj_scanpos = xsp; break; }
+      if (jj_3R_InitDeclaratorList_195_27_105()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3_3()
+  private boolean jj_3_3()
  {
-    if (jj_3R_DeclarationSpecifiers_149_9_13()) return true;
+    if (jj_3R_DeclarationSpecifiers_151_9_13()) return true;
     return false;
   }
 
-  static private boolean jj_3R_TypeQualifier_185_9_72()
+  private boolean jj_3R_TypeQualifier_187_9_72()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -4126,25 +4117,25 @@ if (jjtc000) {
     return false;
   }
 
-  static private boolean jj_3_5()
+  private boolean jj_3_5()
  {
-    if (jj_3R_DeclarationSpecifiers_149_9_13()) return true;
+    if (jj_3R_DeclarationSpecifiers_151_9_13()) return true;
     return false;
   }
 
-  static private boolean jj_3_4()
+  private boolean jj_3_4()
  {
-    if (jj_3R_DeclarationSpecifiers_149_9_13()) return true;
+    if (jj_3R_DeclarationSpecifiers_151_9_13()) return true;
     return false;
   }
 
-  static private boolean jj_3R_DeclarationSpecifiers_149_35_69()
+  private boolean jj_3R_DeclarationSpecifiers_151_35_69()
  {
-    if (jj_3R_DeclarationSpecifiers_149_9_13()) return true;
+    if (jj_3R_DeclarationSpecifiers_151_9_13()) return true;
     return false;
   }
 
-  static private boolean jj_3R_TypeSpecifier_173_9_70()
+  private boolean jj_3R_TypeSpecifier_175_9_70()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -4182,25 +4173,25 @@ if (jjtc000) {
     return false;
   }
 
-  static private boolean jj_3R_DeclarationSpecifiers_153_27_73()
+  private boolean jj_3R_DeclarationSpecifiers_155_27_73()
  {
-    if (jj_3R_DeclarationSpecifiers_149_9_13()) return true;
+    if (jj_3R_DeclarationSpecifiers_151_9_13()) return true;
     return false;
   }
 
-  static private boolean jj_3R_DeclarationSpecifiers_151_28_71()
+  private boolean jj_3R_DeclarationSpecifiers_153_28_71()
  {
-    if (jj_3R_DeclarationSpecifiers_149_9_13()) return true;
+    if (jj_3R_DeclarationSpecifiers_151_9_13()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Declaration_139_35_35()
+  private boolean jj_3R_Declaration_141_35_35()
  {
-    if (jj_3R_InitDeclaratorList_193_9_74()) return true;
+    if (jj_3R_InitDeclaratorList_195_9_74()) return true;
     return false;
   }
 
-  static private boolean jj_3R_StorageClassSpecifier_162_9_68()
+  private boolean jj_3R_StorageClassSpecifier_164_9_68()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -4220,102 +4211,102 @@ if (jjtc000) {
     return false;
   }
 
-  static private boolean jj_3_2()
+  private boolean jj_3_2()
  {
-    if (jj_3R_Declaration_139_9_14()) return true;
+    if (jj_3R_Declaration_141_9_14()) return true;
     return false;
   }
 
-  static private boolean jj_3R_DeclarationSpecifiers_153_9_34()
+  private boolean jj_3R_DeclarationSpecifiers_155_9_34()
  {
-    if (jj_3R_TypeQualifier_185_9_72()) return true;
+    if (jj_3R_TypeQualifier_187_9_72()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_DeclarationSpecifiers_153_27_73()) jj_scanpos = xsp;
+    if (jj_3R_DeclarationSpecifiers_155_27_73()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_DeclarationSpecifiers_151_9_33()
+  private boolean jj_3R_DeclarationSpecifiers_153_9_33()
  {
-    if (jj_3R_TypeSpecifier_173_9_70()) return true;
+    if (jj_3R_TypeSpecifier_175_9_70()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_DeclarationSpecifiers_151_28_71()) jj_scanpos = xsp;
+    if (jj_3R_DeclarationSpecifiers_153_28_71()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_DeclarationSpecifiers_149_9_32()
+  private boolean jj_3R_DeclarationSpecifiers_151_9_32()
  {
-    if (jj_3R_StorageClassSpecifier_162_9_68()) return true;
+    if (jj_3R_StorageClassSpecifier_164_9_68()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_DeclarationSpecifiers_149_35_69()) jj_scanpos = xsp;
+    if (jj_3R_DeclarationSpecifiers_151_35_69()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_DeclarationSpecifiers_149_9_13()
+  private boolean jj_3R_DeclarationSpecifiers_151_9_13()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_DeclarationSpecifiers_149_9_32()) {
+    if (jj_3R_DeclarationSpecifiers_151_9_32()) {
     jj_scanpos = xsp;
-    if (jj_3R_DeclarationSpecifiers_151_9_33()) {
+    if (jj_3R_DeclarationSpecifiers_153_9_33()) {
     jj_scanpos = xsp;
-    if (jj_3R_DeclarationSpecifiers_153_9_34()) return true;
+    if (jj_3R_DeclarationSpecifiers_155_9_34()) return true;
     }
     }
     return false;
   }
 
-  static private boolean jj_3R_DeclarationList_144_11_49()
+  private boolean jj_3R_DeclarationList_146_11_49()
  {
-    if (jj_3R_Declaration_139_9_14()) return true;
+    if (jj_3R_Declaration_141_9_14()) return true;
     return false;
   }
 
-  static private boolean jj_3R_DeclarationList_144_9_23()
+  private boolean jj_3R_DeclarationList_146_9_23()
  {
     Token xsp;
-    if (jj_3R_DeclarationList_144_11_49()) return true;
+    if (jj_3R_DeclarationList_146_11_49()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_DeclarationList_144_11_49()) { jj_scanpos = xsp; break; }
+      if (jj_3R_DeclarationList_146_11_49()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3_1()
+  private boolean jj_3_1()
  {
-    if (jj_3R_DeclarationSpecifiers_149_9_13()) return true;
+    if (jj_3R_DeclarationSpecifiers_151_9_13()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Declaration_139_9_14()
+  private boolean jj_3R_Declaration_141_9_14()
  {
-    if (jj_3R_DeclarationSpecifiers_149_9_13()) return true;
+    if (jj_3R_DeclarationSpecifiers_151_9_13()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_Declaration_139_35_35()) jj_scanpos = xsp;
-    if (jj_scan_token(57)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_UnaryExpression_427_70_92()
- {
-    if (jj_scan_token(60)) return true;
-    if (jj_3R_TypeName_265_9_28()) return true;
-    if (jj_scan_token(61)) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_ArgumentExpressionList_454_34_67()
- {
+    if (jj_3R_Declaration_141_35_35()) jj_scanpos = xsp;
     if (jj_scan_token(58)) return true;
-    if (jj_3R_AssignmentExpression_346_9_66()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Constant_473_9_127()
+  private boolean jj_3R_UnaryExpression_429_70_92()
+ {
+    if (jj_scan_token(61)) return true;
+    if (jj_3R_TypeName_267_9_28()) return true;
+    if (jj_scan_token(62)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_ArgumentExpressionList_456_34_67()
+ {
+    if (jj_scan_token(59)) return true;
+    if (jj_3R_AssignmentExpression_348_9_66()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_Constant_475_9_127()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -4332,27 +4323,27 @@ if (jjtc000) {
     return false;
   }
 
-  static private boolean jj_3R_Identifier_462_9_83()
+  private boolean jj_3R_Identifier_464_9_83()
  {
     if (jj_scan_token(IDENTIFIER)) return true;
     return false;
   }
 
-  static private boolean jj_3R_PostfixExpression_437_31_65()
+  private boolean jj_3R_PostfixExpression_439_31_65()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_PostfixExpression_437_31_99()) {
+    if (jj_3R_PostfixExpression_439_31_99()) {
     jj_scanpos = xsp;
-    if (jj_3R_PostfixExpression_438_9_100()) {
+    if (jj_3R_PostfixExpression_440_9_100()) {
     jj_scanpos = xsp;
-    if (jj_3R_PostfixExpression_439_9_101()) {
+    if (jj_3R_PostfixExpression_441_9_101()) {
     jj_scanpos = xsp;
-    if (jj_3R_PostfixExpression_440_9_102()) {
+    if (jj_3R_PostfixExpression_442_9_102()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(97)) {
+    if (jj_scan_token(98)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(98)) return true;
+    if (jj_scan_token(99)) return true;
     }
     }
     }
@@ -4361,440 +4352,448 @@ if (jjtc000) {
     return false;
   }
 
-  static private boolean jj_3R_PostfixExpression_437_31_99()
+  private boolean jj_3R_PostfixExpression_439_31_99()
  {
-    if (jj_scan_token(62)) return true;
-    if (jj_3R_Expression_341_9_95()) return true;
     if (jj_scan_token(63)) return true;
+    if (jj_3R_Expression_343_9_95()) return true;
+    if (jj_scan_token(64)) return true;
     return false;
   }
 
-  static private boolean jj_3R_ArgumentExpressionList_454_9_31()
+  private boolean jj_3R_ArgumentExpressionList_456_9_31()
  {
-    if (jj_3R_AssignmentExpression_346_9_66()) return true;
+    if (jj_3R_AssignmentExpression_348_9_66()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_ArgumentExpressionList_454_34_67()) { jj_scanpos = xsp; break; }
+      if (jj_3R_ArgumentExpressionList_456_34_67()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3_22()
+  private boolean jj_3_22()
  {
-    if (jj_3R_ArgumentExpressionList_454_9_31()) return true;
+    if (jj_3R_ArgumentExpressionList_456_9_31()) return true;
     return false;
   }
 
-  static private boolean jj_3R_PrimaryExpression_447_11_96()
+  private boolean jj_3R_PrimaryExpression_449_11_96()
  {
-    if (jj_3R_Identifier_462_9_83()) return true;
+    if (jj_3R_Identifier_464_9_83()) return true;
     return false;
   }
 
-  static private boolean jj_3R_PrimaryExpression_449_9_98()
+  private boolean jj_3R_PrimaryExpression_451_9_98()
  {
-    if (jj_scan_token(60)) return true;
-    if (jj_3R_Expression_341_9_95()) return true;
     if (jj_scan_token(61)) return true;
+    if (jj_3R_Expression_343_9_95()) return true;
+    if (jj_scan_token(62)) return true;
     return false;
   }
 
-  static private boolean jj_3_20()
+  private boolean jj_3_20()
  {
-    if (jj_3R_UnaryExpression_423_9_25()) return true;
+    if (jj_3R_UnaryExpression_425_9_25()) return true;
     return false;
   }
 
-  static private boolean jj_3R_PrimaryExpression_448_9_97()
+  private boolean jj_3R_PrimaryExpression_450_9_97()
  {
-    if (jj_3R_Constant_473_9_127()) return true;
+    if (jj_3R_Constant_475_9_127()) return true;
     return false;
   }
 
-  static private boolean jj_3R_PrimaryExpression_447_9_64()
+  private boolean jj_3R_PrimaryExpression_449_9_64()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_PrimaryExpression_447_11_96()) {
+    if (jj_3R_PrimaryExpression_449_11_96()) {
     jj_scanpos = xsp;
-    if (jj_3R_PrimaryExpression_448_9_97()) {
+    if (jj_3R_PrimaryExpression_450_9_97()) {
     jj_scanpos = xsp;
-    if (jj_3R_PrimaryExpression_449_9_98()) return true;
+    if (jj_3R_PrimaryExpression_451_9_98()) return true;
     }
     }
     return false;
   }
 
-  static private boolean jj_3R_PostfixExpression_438_15_128()
+  private boolean jj_3R_PostfixExpression_440_15_128()
  {
-    if (jj_3R_ArgumentExpressionList_454_9_31()) return true;
+    if (jj_3R_ArgumentExpressionList_456_9_31()) return true;
     return false;
   }
 
-  static private boolean jj_3R_PostfixExpression_440_9_102()
+  private boolean jj_3R_PostfixExpression_442_9_102()
+ {
+    if (jj_scan_token(103)) return true;
+    if (jj_3R_Identifier_464_9_83()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_PostfixExpression_441_9_101()
  {
     if (jj_scan_token(102)) return true;
-    if (jj_3R_Identifier_462_9_83()) return true;
+    if (jj_3R_Identifier_464_9_83()) return true;
     return false;
   }
 
-  static private boolean jj_3R_PostfixExpression_439_9_101()
+  private boolean jj_3R_UnaryExpression_429_20_91()
  {
-    if (jj_scan_token(101)) return true;
-    if (jj_3R_Identifier_462_9_83()) return true;
+    if (jj_3R_UnaryExpression_425_9_25()) return true;
     return false;
   }
 
-  static private boolean jj_3R_UnaryExpression_427_20_91()
+  private boolean jj_3R_PostfixExpression_440_9_100()
  {
-    if (jj_3R_UnaryExpression_423_9_25()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_PostfixExpression_438_9_100()
- {
-    if (jj_scan_token(60)) return true;
+    if (jj_scan_token(61)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_PostfixExpression_438_15_128()) jj_scanpos = xsp;
-    if (jj_scan_token(61)) return true;
+    if (jj_3R_PostfixExpression_440_15_128()) jj_scanpos = xsp;
+    if (jj_scan_token(62)) return true;
     return false;
   }
 
-  static private boolean jj_3R_PostfixExpression_437_9_30()
+  private boolean jj_3R_PostfixExpression_439_9_30()
  {
-    if (jj_3R_PrimaryExpression_447_9_64()) return true;
+    if (jj_3R_PrimaryExpression_449_9_64()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_PostfixExpression_437_31_65()) { jj_scanpos = xsp; break; }
+      if (jj_3R_PostfixExpression_439_31_65()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  static private boolean jj_3R_AdditiveExpression_407_38_158()
+  private boolean jj_3R_AdditiveExpression_409_38_158()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(93)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(94)) return true;
-    }
-    if (jj_3R_AdditiveExpression_407_9_155()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_UnaryOperator_432_9_90()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(84)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(64)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(93)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(94)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(99)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(100)) return true;
-    }
-    }
-    }
-    }
+    if (jj_scan_token(95)) return true;
     }
+    if (jj_3R_AdditiveExpression_409_9_155()) return true;
     return false;
   }
 
-  static private boolean jj_3R_MultiplicativeExpression_412_28_159()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(64)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(95)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(96)) return true;
-    }
-    }
-    if (jj_3R_MultiplicativeExpression_412_9_157()) return true;
-    return false;
-  }
-
-  static private boolean jj_3_19()
- {
-    if (jj_scan_token(60)) return true;
-    if (jj_3R_TypeName_265_9_28()) return true;
-    if (jj_scan_token(61)) return true;
-    if (jj_3R_CastExpression_417_9_29()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_UnaryExpression_427_9_58()
- {
-    if (jj_scan_token(SIZEOF)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_UnaryExpression_427_20_91()) {
-    jj_scanpos = xsp;
-    if (jj_3R_UnaryExpression_427_70_92()) return true;
-    }
-    return false;
-  }
-
-  static private boolean jj_3R_UnaryExpression_426_9_57()
- {
-    if (jj_3R_UnaryOperator_432_9_90()) return true;
-    if (jj_3R_CastExpression_417_9_29()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_ShiftExpression_402_32_156()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(91)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(92)) return true;
-    }
-    if (jj_3R_ShiftExpression_402_9_153()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_UnaryExpression_425_9_56()
- {
-    if (jj_scan_token(98)) return true;
-    if (jj_3R_UnaryExpression_423_9_25()) return true;
-    return false;
-  }
-
-  static private boolean jj_3_21()
- {
-    if (jj_3R_PostfixExpression_437_9_30()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_UnaryExpression_424_9_55()
- {
-    if (jj_scan_token(97)) return true;
-    if (jj_3R_UnaryExpression_423_9_25()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_UnaryExpression_423_9_25()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3_21()) {
-    jj_scanpos = xsp;
-    if (jj_3R_UnaryExpression_424_9_55()) {
-    jj_scanpos = xsp;
-    if (jj_3R_UnaryExpression_425_9_56()) {
-    jj_scanpos = xsp;
-    if (jj_3R_UnaryExpression_426_9_57()) {
-    jj_scanpos = xsp;
-    if (jj_3R_UnaryExpression_427_9_58()) return true;
-    }
-    }
-    }
-    }
-    return false;
-  }
-
-  static private boolean jj_3R_CastExpression_417_11_62()
- {
-    if (jj_scan_token(60)) return true;
-    if (jj_3R_TypeName_265_9_28()) return true;
-    if (jj_scan_token(61)) return true;
-    if (jj_3R_CastExpression_417_9_29()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_CastExpression_418_9_63()
- {
-    if (jj_3R_UnaryExpression_423_9_25()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_RelationalExpression_397_29_154()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(87)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(88)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(89)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(90)) return true;
-    }
-    }
-    }
-    if (jj_3R_RelationalExpression_397_9_149()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_EqualityExpression_392_34_150()
+  private boolean jj_3R_UnaryOperator_434_9_90()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(85)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(86)) return true;
-    }
-    if (jj_3R_EqualityExpression_392_9_142()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_CastExpression_417_9_29()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_CastExpression_417_11_62()) {
+    if (jj_scan_token(65)) {
     jj_scanpos = xsp;
-    if (jj_3R_CastExpression_418_9_63()) return true;
+    if (jj_scan_token(94)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(95)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(100)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(101)) return true;
+    }
+    }
+    }
+    }
     }
     return false;
   }
 
-  static private boolean jj_3R_MultiplicativeExpression_412_9_157()
+  private boolean jj_3R_MultiplicativeExpression_414_28_159()
  {
-    if (jj_3R_CastExpression_417_9_29()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_MultiplicativeExpression_412_28_159()) jj_scanpos = xsp;
+    if (jj_scan_token(65)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(96)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(97)) return true;
+    }
+    }
+    if (jj_3R_MultiplicativeExpression_414_9_157()) return true;
     return false;
   }
 
-  static private boolean jj_3R_ANDExpression_387_32_143()
+  private boolean jj_3_19()
  {
-    if (jj_scan_token(84)) return true;
-    if (jj_3R_ANDExpression_387_9_137()) return true;
+    if (jj_scan_token(61)) return true;
+    if (jj_3R_TypeName_267_9_28()) return true;
+    if (jj_scan_token(62)) return true;
+    if (jj_3R_CastExpression_419_9_29()) return true;
     return false;
   }
 
-  static private boolean jj_3R_AdditiveExpression_407_9_155()
+  private boolean jj_3R_UnaryExpression_429_9_58()
  {
-    if (jj_3R_MultiplicativeExpression_412_9_157()) return true;
+    if (jj_scan_token(SIZEOF)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_AdditiveExpression_407_38_158()) jj_scanpos = xsp;
+    if (jj_3R_UnaryExpression_429_20_91()) {
+    jj_scanpos = xsp;
+    if (jj_3R_UnaryExpression_429_70_92()) return true;
+    }
     return false;
   }
 
-  static private boolean jj_3R_InclusiveORExpression_377_35_134()
+  private boolean jj_3R_UnaryExpression_428_9_57()
  {
-    if (jj_scan_token(82)) return true;
-    if (jj_3R_InclusiveORExpression_377_9_123()) return true;
+    if (jj_3R_UnaryOperator_434_9_90()) return true;
+    if (jj_3R_CastExpression_419_9_29()) return true;
     return false;
   }
 
-  static private boolean jj_3R_ShiftExpression_402_9_153()
+  private boolean jj_3R_ShiftExpression_404_32_156()
  {
-    if (jj_3R_AdditiveExpression_407_9_155()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_ShiftExpression_402_32_156()) jj_scanpos = xsp;
+    if (jj_scan_token(92)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(93)) return true;
+    }
+    if (jj_3R_ShiftExpression_404_9_153()) return true;
     return false;
   }
 
-  static private boolean jj_3R_ExclusiveORExpression_382_27_138()
+  private boolean jj_3R_UnaryExpression_427_9_56()
+ {
+    if (jj_scan_token(99)) return true;
+    if (jj_3R_UnaryExpression_425_9_25()) return true;
+    return false;
+  }
+
+  private boolean jj_3_21()
+ {
+    if (jj_3R_PostfixExpression_439_9_30()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_UnaryExpression_426_9_55()
+ {
+    if (jj_scan_token(98)) return true;
+    if (jj_3R_UnaryExpression_425_9_25()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_UnaryExpression_425_9_25()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_21()) {
+    jj_scanpos = xsp;
+    if (jj_3R_UnaryExpression_426_9_55()) {
+    jj_scanpos = xsp;
+    if (jj_3R_UnaryExpression_427_9_56()) {
+    jj_scanpos = xsp;
+    if (jj_3R_UnaryExpression_428_9_57()) {
+    jj_scanpos = xsp;
+    if (jj_3R_UnaryExpression_429_9_58()) return true;
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_CastExpression_419_11_62()
+ {
+    if (jj_scan_token(61)) return true;
+    if (jj_3R_TypeName_267_9_28()) return true;
+    if (jj_scan_token(62)) return true;
+    if (jj_3R_CastExpression_419_9_29()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_CastExpression_420_9_63()
+ {
+    if (jj_3R_UnaryExpression_425_9_25()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_RelationalExpression_399_29_154()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(88)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(89)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(90)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(91)) return true;
+    }
+    }
+    }
+    if (jj_3R_RelationalExpression_399_9_149()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_EqualityExpression_394_34_150()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(86)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(87)) return true;
+    }
+    if (jj_3R_EqualityExpression_394_9_142()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_CastExpression_419_9_29()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_CastExpression_419_11_62()) {
+    jj_scanpos = xsp;
+    if (jj_3R_CastExpression_420_9_63()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_MultiplicativeExpression_414_9_157()
+ {
+    if (jj_3R_CastExpression_419_9_29()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_MultiplicativeExpression_414_28_159()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_ANDExpression_389_32_143()
+ {
+    if (jj_scan_token(85)) return true;
+    if (jj_3R_ANDExpression_389_9_137()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_AdditiveExpression_409_9_155()
+ {
+    if (jj_3R_MultiplicativeExpression_414_9_157()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_AdditiveExpression_409_38_158()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_InclusiveORExpression_379_35_134()
  {
     if (jj_scan_token(83)) return true;
-    if (jj_3R_ExclusiveORExpression_382_9_133()) return true;
+    if (jj_3R_InclusiveORExpression_379_9_123()) return true;
     return false;
   }
 
-  static private boolean jj_3R_LogicalANDExpression_372_35_124()
+  private boolean jj_3R_ShiftExpression_404_9_153()
+ {
+    if (jj_3R_AdditiveExpression_409_9_155()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_ShiftExpression_404_32_156()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_ExclusiveORExpression_384_27_138()
+ {
+    if (jj_scan_token(84)) return true;
+    if (jj_3R_ExclusiveORExpression_384_9_133()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_LogicalANDExpression_374_35_124()
+ {
+    if (jj_scan_token(82)) return true;
+    if (jj_3R_LogicalANDExpression_374_9_93()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_Expression_343_66_126()
+ {
+    if (jj_3R_DeclarationSpecifiers_151_9_13()) return true;
+    if (jj_3R_InitDeclaratorList_195_9_74()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_RelationalExpression_399_9_149()
+ {
+    if (jj_3R_ShiftExpression_404_9_153()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_RelationalExpression_399_29_154()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_EqualityExpression_394_9_142()
+ {
+    if (jj_3R_RelationalExpression_399_9_149()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_EqualityExpression_394_34_150()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_LogicalORExpression_369_34_94()
  {
     if (jj_scan_token(81)) return true;
-    if (jj_3R_LogicalANDExpression_372_9_93()) return true;
+    if (jj_3R_LogicalORExpression_369_9_59()) return true;
     return false;
   }
 
-  static private boolean jj_3R_Expression_341_66_126()
+  private boolean jj_3R_ANDExpression_389_9_137()
  {
-    if (jj_3R_DeclarationSpecifiers_149_9_13()) return true;
-    if (jj_3R_InitDeclaratorList_193_9_74()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_RelationalExpression_397_9_149()
- {
-    if (jj_3R_ShiftExpression_402_9_153()) return true;
+    if (jj_3R_EqualityExpression_394_9_142()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_RelationalExpression_397_29_154()) jj_scanpos = xsp;
+    if (jj_3R_ANDExpression_389_32_143()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_EqualityExpression_392_9_142()
+  private boolean jj_3R_ExclusiveORExpression_384_9_133()
  {
-    if (jj_3R_RelationalExpression_397_9_149()) return true;
+    if (jj_3R_ANDExpression_389_9_137()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_EqualityExpression_392_34_150()) jj_scanpos = xsp;
+    if (jj_3R_ExclusiveORExpression_384_27_138()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_LogicalORExpression_367_34_94()
+  private boolean jj_3R_ConditionalExpression_359_33_60()
  {
     if (jj_scan_token(80)) return true;
-    if (jj_3R_LogicalORExpression_367_9_59()) return true;
+    if (jj_3R_Expression_343_9_95()) return true;
+    if (jj_scan_token(69)) return true;
+    if (jj_3R_ConditionalExpression_359_9_27()) return true;
     return false;
   }
 
-  static private boolean jj_3R_ANDExpression_387_9_137()
+  private boolean jj_3R_InclusiveORExpression_379_9_123()
  {
-    if (jj_3R_EqualityExpression_392_9_142()) return true;
+    if (jj_3R_ExclusiveORExpression_384_9_133()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_ANDExpression_387_32_143()) jj_scanpos = xsp;
+    if (jj_3R_InclusiveORExpression_379_35_134()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_ExclusiveORExpression_382_9_133()
+  private boolean jj_3R_LogicalANDExpression_374_9_93()
  {
-    if (jj_3R_ANDExpression_387_9_137()) return true;
+    if (jj_3R_InclusiveORExpression_379_9_123()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_ExclusiveORExpression_382_27_138()) jj_scanpos = xsp;
+    if (jj_3R_LogicalANDExpression_374_35_124()) jj_scanpos = xsp;
     return false;
   }
 
-  static private boolean jj_3R_ConditionalExpression_357_33_60()
- {
-    if (jj_scan_token(79)) return true;
-    if (jj_3R_Expression_341_9_95()) return true;
-    if (jj_scan_token(68)) return true;
-    if (jj_3R_ConditionalExpression_357_9_27()) return true;
-    return false;
-  }
-
-  static private boolean jj_3R_InclusiveORExpression_377_9_123()
- {
-    if (jj_3R_ExclusiveORExpression_382_9_133()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_InclusiveORExpression_377_35_134()) jj_scanpos = xsp;
-    return false;
-  }
-
-  static private boolean jj_initialized_once = false;
   /** Generated Token Manager. */
-  static public CParserTokenManager token_source;
-  static SimpleCharStream jj_input_stream;
+  public CParserTokenManager token_source;
+  SimpleCharStream jj_input_stream;
   /** Current token. */
-  static public Token token;
+  public Token token;
   /** Next token. */
-  static public Token jj_nt;
-  static private int jj_ntk;
-  static private Token jj_scanpos, jj_lastpos;
-  static private int jj_la;
-  static private int jj_gen;
-  static final private int[] jj_la1 = new int[73];
+  public Token jj_nt;
+  private int jj_ntk;
+  private Token jj_scanpos, jj_lastpos;
+  private int jj_la;
+  private int jj_gen;
+  final private int[] jj_la1 = new int[73];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -4809,17 +4808,17 @@ if (jjtc000) {
 	   jj_la1_0 = new int[] {0x0,0x8bd00000,0x82800000,0x9100000,0x400000,0x0,0x0,0x9500000,0x0,0x0,0x0,0x100d1000,0x0,0x0,0x0,0x400000,0x0,0x400000,0x0,0x0,0x0,0x0,0x100d1000,0x0,0x0,0x0,0x100d1000,0x8bd00000,0x0,0x0,0x100d1000,0x8bd00000,0x0,0xfbfd1000,0x4000000,0x9bdd1000,0xfffd1000,0xfffd1000,0x20000000,0x9bdd1000,0x9bdd1000,0x9bdd1000,0x0,0x9bdd1000,0x40200000,0x0,0x9bdd1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100d1000,0x0,0x10000000,0x0,0x0,0x0,0xd1000,0x0,0xd1000,};
 	}
 	private static void jj_la1_init_1() {
-	   jj_la1_1 = new int[] {0x10400000,0x24e9c6,0x2002,0x24c984,0x40,0x4000000,0x8000000,0x24c9c4,0x0,0x10400000,0x50000000,0x10400000,0x400000,0x40000000,0x10000000,0x40,0x0,0x40,0x4000000,0x50000000,0x4000000,0x4000000,0x10400000,0x50000000,0x0,0x50000000,0x10400000,0x24e9c6,0x50000000,0x50000000,0x10400000,0x24e9c6,0x50000000,0x127fe9de,0x400400,0x1064e9c6,0x127fedde,0x127fedde,0x80000,0x1064e9c6,0x1064e9c6,0x1064e9c6,0x120008,0x1064e9c6,0x10010,0x4000000,0x1064e9c6,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10400000,0x10000000,0x0,0x0,0x50000000,0x50000000,0x10400000,0x4000000,0x0,};
+	   jj_la1_1 = new int[] {0x20400000,0x24e9c6,0x2002,0x24c984,0x40,0x8000000,0x10000000,0x24c9c4,0x0,0x20400000,0xa0000000,0x20400000,0x400000,0x80000000,0x20000000,0x40,0x0,0x40,0x8000000,0xa0000000,0x8000000,0x8000000,0x20400000,0xa0000000,0x0,0xa0000000,0x20400000,0x24e9c6,0xa0000000,0xa0000000,0x20400000,0x24e9c6,0xa0000000,0x247fe9de,0x400400,0x2064e9c6,0x247fedde,0x247fedde,0x80000,0x2064e9c6,0x2064e9c6,0x2064e9c6,0x120008,0x2064e9c6,0x10010,0x8000000,0x2064e9c6,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20400000,0x20000000,0x0,0x0,0xa0000000,0xa0000000,0x20400000,0x8000000,0x0,};
 	}
 	private static void jj_la1_init_2() {
-	   jj_la1_2 = new int[] {0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x60100001,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x0,0x60100005,0x1,0x1,0x1,0x60100001,0x0,0x0,0x0,0x60100001,0x0,0x0,0x60100005,0x0,0x60100001,0x60100005,0x60100005,0x0,0x60100001,0x60100001,0x60100001,0x0,0x60100001,0x0,0x0,0x60100001,0x7fe0,0x8000,0x10000,0x20000,0x40000,0x80000,0x100000,0x600000,0x600000,0x7800000,0x7800000,0x18000000,0x18000000,0x60000000,0x60000000,0x80000001,0x80000001,0x60100001,0x0,0x60100001,0x60100001,0x0,0x0,0x0,0x0,0x0,};
+	   jj_la1_2 = new int[] {0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0xc0200002,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x2,0x0,0x0,0xc020000a,0x2,0x2,0x2,0xc0200002,0x0,0x0,0x0,0xc0200002,0x0,0x0,0xc020000a,0x0,0xc0200002,0xc020000a,0xc020000a,0x0,0xc0200002,0xc0200002,0xc0200002,0x0,0xc0200002,0x0,0x0,0xc0200002,0xffc0,0x10000,0x20000,0x40000,0x80000,0x100000,0x200000,0xc00000,0xc00000,0xf000000,0xf000000,0x30000000,0x30000000,0xc0000000,0xc0000000,0x2,0x2,0xc0200002,0x0,0xc0200002,0xc0200002,0x0,0x0,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_3() {
-	   jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e,0x0,0x0,0x0,0x1e,0x0,0x0,0x0,0x1e,0x0,0x0,0x1e,0x0,0x1e,0x1e,0x1e,0x0,0x1e,0x1e,0x1e,0x0,0x1e,0x0,0x0,0x1e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x1e,0x0,0x1e,0x18,0x66,0x66,0x0,0x0,0x0,};
+	   jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3c,0x0,0x0,0x0,0x3c,0x0,0x0,0x0,0x3c,0x0,0x0,0x3c,0x0,0x3c,0x3c,0x3c,0x0,0x3c,0x3c,0x3c,0x0,0x3c,0x0,0x0,0x3c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x3,0x3c,0x0,0x3c,0x30,0xcc,0xcc,0x0,0x0,0x0,};
 	}
-  static final private JJCalls[] jj_2_rtns = new JJCalls[22];
-  static private boolean jj_rescan = false;
-  static private int jj_gc = 0;
+  final private JJCalls[] jj_2_rtns = new JJCalls[22];
+  private boolean jj_rescan = false;
+  private int jj_gc = 0;
 
   /** Constructor with InputStream. */
   public CParser(java.io.InputStream stream) {
@@ -4827,13 +4826,6 @@ if (jjtc000) {
   }
   /** Constructor with InputStream and supplied encoding */
   public CParser(java.io.InputStream stream, String encoding) {
-	 if (jj_initialized_once) {
-	   System.out.println("ERROR: Second call to constructor of static parser.  ");
-	   System.out.println("	   You must either use ReInit() or set the JavaCC option STATIC to false");
-	   System.out.println("	   during parser generation.");
-	   throw new Error();
-	 }
-	 jj_initialized_once = true;
 	 try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
 	 token_source = new CParserTokenManager(jj_input_stream);
 	 token = new Token();
@@ -4844,11 +4836,11 @@ if (jjtc000) {
   }
 
   /** Reinitialise. */
-  static public void ReInit(java.io.InputStream stream) {
+  public void ReInit(java.io.InputStream stream) {
 	  ReInit(stream, null);
   }
   /** Reinitialise. */
-  static public void ReInit(java.io.InputStream stream, String encoding) {
+  public void ReInit(java.io.InputStream stream, String encoding) {
 	 try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
 	 token_source.ReInit(jj_input_stream);
 	 token = new Token();
@@ -4861,13 +4853,6 @@ if (jjtc000) {
 
   /** Constructor. */
   public CParser(java.io.Reader stream) {
-	 if (jj_initialized_once) {
-	   System.out.println("ERROR: Second call to constructor of static parser. ");
-	   System.out.println("	   You must either use ReInit() or set the JavaCC option STATIC to false");
-	   System.out.println("	   during parser generation.");
-	   throw new Error();
-	 }
-	 jj_initialized_once = true;
 	 jj_input_stream = new SimpleCharStream(stream, 1, 1);
 	 token_source = new CParserTokenManager(jj_input_stream);
 	 token = new Token();
@@ -4878,7 +4863,7 @@ if (jjtc000) {
   }
 
   /** Reinitialise. */
-  static public void ReInit(java.io.Reader stream) {
+  public void ReInit(java.io.Reader stream) {
 	if (jj_input_stream == null) {
 	   jj_input_stream = new SimpleCharStream(stream, 1, 1);
 	} else {
@@ -4899,13 +4884,6 @@ if (jjtc000) {
 
   /** Constructor with generated Token Manager. */
   public CParser(CParserTokenManager tm) {
-	 if (jj_initialized_once) {
-	   System.out.println("ERROR: Second call to constructor of static parser. ");
-	   System.out.println("	   You must either use ReInit() or set the JavaCC option STATIC to false");
-	   System.out.println("	   during parser generation.");
-	   throw new Error();
-	 }
-	 jj_initialized_once = true;
 	 token_source = tm;
 	 token = new Token();
 	 jj_ntk = -1;
@@ -4925,7 +4903,7 @@ if (jjtc000) {
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
-  static private Token jj_consume_token(int kind) throws ParseException {
+  private Token jj_consume_token(int kind) throws ParseException {
 	 Token oldToken;
 	 if ((oldToken = token).next != null) token = token.next;
 	 else token = token.next = token_source.getNextToken();
@@ -4957,7 +4935,7 @@ if (jjtc000) {
     }
   }
   static private final LookaheadSuccess jj_ls = new LookaheadSuccess();
-  static private boolean jj_scan_token(int kind) {
+  private boolean jj_scan_token(int kind) {
 	 if (jj_scanpos == jj_lastpos) {
 	   jj_la--;
 	   if (jj_scanpos.next == null) {
@@ -4980,7 +4958,7 @@ if (jjtc000) {
 
 
 /** Get the next Token. */
-  static final public Token getNextToken() {
+  final public Token getNextToken() {
 	 if (token.next != null) token = token.next;
 	 else token = token.next = token_source.getNextToken();
 	 jj_ntk = -1;
@@ -4989,7 +4967,7 @@ if (jjtc000) {
   }
 
 /** Get the specific Token. */
-  static final public Token getToken(int index) {
+  final public Token getToken(int index) {
 	 Token t = token;
 	 for (int i = 0; i < index; i++) {
 	   if (t.next != null) t = t.next;
@@ -4998,20 +4976,20 @@ if (jjtc000) {
 	 return t;
   }
 
-  static private int jj_ntk_f() {
+  private int jj_ntk_f() {
 	 if ((jj_nt=token.next) == null)
 	   return (jj_ntk = (token.next=token_source.getNextToken()).kind);
 	 else
 	   return (jj_ntk = jj_nt.kind);
   }
 
-  static private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
-  static private int[] jj_expentry;
-  static private int jj_kind = -1;
-  static private int[] jj_lasttokens = new int[100];
-  static private int jj_endpos;
+  private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
+  private int[] jj_expentry;
+  private int jj_kind = -1;
+  private int[] jj_lasttokens = new int[100];
+  private int jj_endpos;
 
-  static private void jj_add_error_token(int kind, int pos) {
+  private void jj_add_error_token(int kind, int pos) {
 	 if (pos >= 100) {
 		return;
 	 }
@@ -5050,9 +5028,9 @@ if (jjtc000) {
   }
 
   /** Generate ParseException. */
-  static public ParseException generateParseException() {
+  public ParseException generateParseException() {
 	 jj_expentries.clear();
-	 boolean[] la1tokens = new boolean[103];
+	 boolean[] la1tokens = new boolean[104];
 	 if (jj_kind >= 0) {
 	   la1tokens[jj_kind] = true;
 	   jj_kind = -1;
@@ -5075,7 +5053,7 @@ if (jjtc000) {
 		 }
 	   }
 	 }
-	 for (int i = 0; i < 103; i++) {
+	 for (int i = 0; i < 104; i++) {
 	   if (la1tokens[i]) {
 		 jj_expentry = new int[1];
 		 jj_expentry[0] = i;
@@ -5092,22 +5070,22 @@ if (jjtc000) {
 	 return new ParseException(token, exptokseq, tokenImage);
   }
 
-  static private boolean trace_enabled;
+  private boolean trace_enabled;
 
 /** Trace enabled. */
-  static final public boolean trace_enabled() {
+  final public boolean trace_enabled() {
 	 return trace_enabled;
   }
 
   /** Enable tracing. */
-  static final public void enable_tracing() {
+  final public void enable_tracing() {
   }
 
   /** Disable tracing. */
-  static final public void disable_tracing() {
+  final public void disable_tracing() {
   }
 
-  static private void jj_rescan_token() {
+  private void jj_rescan_token() {
 	 jj_rescan = true;
 	 for (int i = 0; i < 22; i++) {
 	   try {
@@ -5149,7 +5127,7 @@ if (jjtc000) {
 	 jj_rescan = false;
   }
 
-  static private void jj_save(int index, int xla) {
+  private void jj_save(int index, int xla) {
 	 JJCalls p = jj_2_rtns[index];
 	 while (p.gen > jj_gen) {
 	   if (p.next == null) { p = p.next = new JJCalls(); break; }
diff --git a/src/main/java/ghidrust/decompiler/parser/c/gen/CParserConstants.java b/src/main/java/ghidrust/decompiler/parser/c/gen/CParserConstants.java
index 658fa66..b2be2a6 100644
--- a/src/main/java/ghidrust/decompiler/parser/c/gen/CParserConstants.java
+++ b/src/main/java/ghidrust/decompiler/parser/c/gen/CParserConstants.java
@@ -100,6 +100,8 @@ public interface CParserConstants {
   int LETTER = 55;
   /** RegularExpression Id. */
   int DIGIT = 56;
+  /** RegularExpression Id. */
+  int SEPARATOR = 57;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -165,6 +167,7 @@ public interface CParserConstants {
     "<IDENTIFIER>",
     "<LETTER>",
     "<DIGIT>",
+    "<SEPARATOR>",
     "\";\"",
     "\",\"",
     "\"=\"",
diff --git a/src/main/java/ghidrust/decompiler/parser/c/gen/CParserTokenManager.java b/src/main/java/ghidrust/decompiler/parser/c/gen/CParserTokenManager.java
index b22efc5..9bdf659 100644
--- a/src/main/java/ghidrust/decompiler/parser/c/gen/CParserTokenManager.java
+++ b/src/main/java/ghidrust/decompiler/parser/c/gen/CParserTokenManager.java
@@ -12,29 +12,40 @@ import ghidrust.decompiler.parser.c.CVisitor;
 public class CParserTokenManager implements CParserConstants {
 
   /** Debug output. */
-  public static  java.io.PrintStream debugStream = System.out;
+  public  java.io.PrintStream debugStream = System.out;
   /** Set debug output. */
-  public static  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
-private static final int jjStopStringLiteralDfa_0(int pos, long active0, long active1){
+  public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
+private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1){
    switch (pos)
    {
       case 0:
-         if ((active1 & 0x2000000002L) != 0L)
+         if ((active1 & 0x4000000004L) != 0L)
             return 4;
          if ((active0 & 0x2001000000L) != 0L)
          {
             jjmatchedKind = 54;
             return 38;
          }
-         if ((active1 & 0x80000040L) != 0L)
-            return 62;
+         if ((active1 & 0x100000080L) != 0L)
+            return 65;
+         if ((active1 & 0x20L) != 0L)
+            return 43;
          if ((active0 & 0x3fffdffee00000L) != 0L)
          {
             jjmatchedKind = 54;
-            return 41;
+            return 76;
          }
          return -1;
       case 1:
+         if ((active0 & 0x27ffdff6e00000L) != 0L)
+         {
+            if (jjmatchedPos != 1)
+            {
+               jjmatchedKind = 54;
+               jjmatchedPos = 1;
+            }
+            return 76;
+         }
          if ((active0 & 0x2001000000L) != 0L)
          {
             if (jjmatchedPos != 1)
@@ -44,138 +55,129 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac
             }
             return 37;
          }
-         if ((active0 & 0x27ffdff6e00000L) != 0L)
-         {
-            if (jjmatchedPos != 1)
-            {
-               jjmatchedKind = 54;
-               jjmatchedPos = 1;
-            }
-            return 41;
-         }
          if ((active0 & 0x18000008000000L) != 0L)
-            return 41;
+            return 76;
          return -1;
       case 2:
-         if ((active0 & 0x6000000000000L) != 0L)
-            return 41;
          if ((active0 & 0x21ffffffe00000L) != 0L)
          {
             jjmatchedKind = 54;
             jjmatchedPos = 2;
-            return 41;
+            return 76;
          }
+         if ((active0 & 0x6000000000000L) != 0L)
+            return 76;
          return -1;
       case 3:
-         if ((active0 & 0x21fe0000000000L) != 0L)
-            return 41;
          if ((active0 & 0x1ffffe00000L) != 0L)
          {
             jjmatchedKind = 54;
             jjmatchedPos = 3;
-            return 41;
+            return 76;
          }
+         if ((active0 & 0x21fe0000000000L) != 0L)
+            return 76;
          return -1;
       case 4:
          if ((active0 & 0x7ffe00000L) != 0L)
          {
             jjmatchedKind = 54;
             jjmatchedPos = 4;
-            return 41;
+            return 76;
          }
          if ((active0 & 0x1f800000000L) != 0L)
-            return 41;
+            return 76;
          return -1;
       case 5:
-         if ((active0 & 0x7f8000000L) != 0L)
-            return 41;
          if ((active0 & 0x7e00000L) != 0L)
          {
             jjmatchedKind = 54;
             jjmatchedPos = 5;
-            return 41;
+            return 76;
          }
+         if ((active0 & 0x7f8000000L) != 0L)
+            return 76;
          return -1;
       case 6:
-         if ((active0 & 0x6000000L) != 0L)
-            return 41;
          if ((active0 & 0x1e00000L) != 0L)
          {
             jjmatchedKind = 54;
             jjmatchedPos = 6;
-            return 41;
+            return 76;
          }
+         if ((active0 & 0x6000000L) != 0L)
+            return 76;
          return -1;
       default :
          return -1;
    }
 }
-private static final int jjStartNfa_0(int pos, long active0, long active1){
+private final int jjStartNfa_0(int pos, long active0, long active1){
    return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1), pos + 1);
 }
-static private int jjStopAtPos(int pos, int kind)
+private int jjStopAtPos(int pos, int kind)
 {
    jjmatchedKind = kind;
    jjmatchedPos = pos;
    return pos + 1;
 }
-static private int jjMoveStringLiteralDfa0_0(){
+private int jjMoveStringLiteralDfa0_0(){
    switch(curChar)
    {
       case 33:
-         jjmatchedKind = 100;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x400000L);
+         jjmatchedKind = 101;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x800000L);
       case 35:
          return jjStopAtPos(0, 7);
       case 37:
+         jjmatchedKind = 97;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x100L);
+      case 38:
+         jjmatchedKind = 85;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x42000L);
+      case 40:
+         return jjStopAtPos(0, 61);
+      case 41:
+         return jjStopAtPos(0, 62);
+      case 42:
+         jjmatchedKind = 65;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x40L);
+      case 43:
+         jjmatchedKind = 94;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x400000200L);
+      case 44:
+         return jjStopAtPos(0, 59);
+      case 45:
+         jjmatchedKind = 95;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x8800000400L);
+      case 46:
+         jjmatchedKind = 102;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x4L);
+      case 47:
          jjmatchedKind = 96;
          return jjMoveStringLiteralDfa1_0(0x0L, 0x80L);
-      case 38:
-         jjmatchedKind = 84;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x21000L);
-      case 40:
-         return jjStopAtPos(0, 60);
-      case 41:
-         return jjStopAtPos(0, 61);
-      case 42:
-         jjmatchedKind = 64;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x20L);
-      case 43:
-         jjmatchedKind = 93;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x200000100L);
-      case 44:
-         return jjStopAtPos(0, 58);
-      case 45:
-         jjmatchedKind = 94;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x4400000200L);
-      case 46:
-         jjmatchedKind = 101;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x2L);
-      case 47:
-         jjmatchedKind = 95;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x40L);
       case 58:
-         return jjStopAtPos(0, 68);
+         return jjStartNfaWithStates_0(0, 69, 43);
       case 59:
-         return jjStopAtPos(0, 57);
+         return jjStopAtPos(0, 58);
       case 60:
-         jjmatchedKind = 87;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0xa000400L);
-      case 61:
-         jjmatchedKind = 59;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x200000L);
-      case 62:
          jjmatchedKind = 88;
          return jjMoveStringLiteralDfa1_0(0x0L, 0x14000800L);
+      case 61:
+         jjmatchedKind = 60;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x400000L);
+      case 62:
+         jjmatchedKind = 89;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x28001000L);
       case 63:
-         return jjStopAtPos(0, 79);
+         return jjStopAtPos(0, 80);
       case 91:
-         return jjStopAtPos(0, 62);
-      case 93:
          return jjStopAtPos(0, 63);
+      case 93:
+         return jjStopAtPos(0, 64);
       case 94:
-         jjmatchedKind = 83;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x2000L);
+         jjmatchedKind = 84;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x4000L);
       case 97:
          return jjMoveStringLiteralDfa1_0(0x200000000000L, 0x0L);
       case 98:
@@ -207,19 +209,19 @@ static private int jjMoveStringLiteralDfa0_0(){
       case 119:
          return jjMoveStringLiteralDfa1_0(0x800000000L, 0x0L);
       case 123:
-         return jjStopAtPos(0, 66);
-      case 124:
-         jjmatchedKind = 82;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x14000L);
-      case 125:
          return jjStopAtPos(0, 67);
+      case 124:
+         jjmatchedKind = 83;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x28000L);
+      case 125:
+         return jjStopAtPos(0, 68);
       case 126:
-         return jjStopAtPos(0, 99);
+         return jjStopAtPos(0, 100);
       default :
          return jjMoveNfa_0(0, 0);
    }
 }
-static private int jjMoveStringLiteralDfa1_0(long active0, long active1){
+private int jjMoveStringLiteralDfa1_0(long active0, long active1){
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       jjStopStringLiteralDfa_0(0, active0, active1);
@@ -228,30 +230,28 @@ static private int jjMoveStringLiteralDfa1_0(long active0, long active1){
    switch(curChar)
    {
       case 38:
-         if ((active1 & 0x20000L) != 0L)
-            return jjStopAtPos(1, 81);
+         if ((active1 & 0x40000L) != 0L)
+            return jjStopAtPos(1, 82);
          break;
       case 43:
-         if ((active1 & 0x200000000L) != 0L)
-            return jjStopAtPos(1, 97);
-         break;
-      case 45:
          if ((active1 & 0x400000000L) != 0L)
             return jjStopAtPos(1, 98);
          break;
+      case 45:
+         if ((active1 & 0x800000000L) != 0L)
+            return jjStopAtPos(1, 99);
+         break;
       case 46:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4L);
       case 60:
-         if ((active1 & 0x8000000L) != 0L)
+         if ((active1 & 0x10000000L) != 0L)
          {
-            jjmatchedKind = 91;
+            jjmatchedKind = 92;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x400L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x800L);
       case 61:
-         if ((active1 & 0x20L) != 0L)
-            return jjStopAtPos(1, 69);
-         else if ((active1 & 0x40L) != 0L)
+         if ((active1 & 0x40L) != 0L)
             return jjStopAtPos(1, 70);
          else if ((active1 & 0x80L) != 0L)
             return jjStopAtPos(1, 71);
@@ -259,37 +259,39 @@ static private int jjMoveStringLiteralDfa1_0(long active0, long active1){
             return jjStopAtPos(1, 72);
          else if ((active1 & 0x200L) != 0L)
             return jjStopAtPos(1, 73);
-         else if ((active1 & 0x1000L) != 0L)
-            return jjStopAtPos(1, 76);
+         else if ((active1 & 0x400L) != 0L)
+            return jjStopAtPos(1, 74);
          else if ((active1 & 0x2000L) != 0L)
             return jjStopAtPos(1, 77);
          else if ((active1 & 0x4000L) != 0L)
             return jjStopAtPos(1, 78);
-         else if ((active1 & 0x200000L) != 0L)
-            return jjStopAtPos(1, 85);
+         else if ((active1 & 0x8000L) != 0L)
+            return jjStopAtPos(1, 79);
          else if ((active1 & 0x400000L) != 0L)
             return jjStopAtPos(1, 86);
-         else if ((active1 & 0x2000000L) != 0L)
-            return jjStopAtPos(1, 89);
+         else if ((active1 & 0x800000L) != 0L)
+            return jjStopAtPos(1, 87);
          else if ((active1 & 0x4000000L) != 0L)
             return jjStopAtPos(1, 90);
+         else if ((active1 & 0x8000000L) != 0L)
+            return jjStopAtPos(1, 91);
          break;
       case 62:
-         if ((active1 & 0x10000000L) != 0L)
+         if ((active1 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 92;
+            jjmatchedKind = 93;
             jjmatchedPos = 1;
          }
-         else if ((active1 & 0x4000000000L) != 0L)
-            return jjStopAtPos(1, 102);
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x800L);
+         else if ((active1 & 0x8000000000L) != 0L)
+            return jjStopAtPos(1, 103);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000L);
       case 97:
          return jjMoveStringLiteralDfa2_0(active0, 0x40000000000L, active1, 0L);
       case 101:
          return jjMoveStringLiteralDfa2_0(active0, 0x44800000L, active1, 0L);
       case 102:
          if ((active0 & 0x8000000000000L) != 0L)
-            return jjStartNfaWithStates_0(1, 51, 41);
+            return jjStartNfaWithStates_0(1, 51, 76);
          break;
       case 104:
          return jjMoveStringLiteralDfa2_0(active0, 0x810800000000L, active1, 0L);
@@ -319,15 +321,15 @@ static private int jjMoveStringLiteralDfa1_0(long active0, long active1){
       case 121:
          return jjMoveStringLiteralDfa2_0(active0, 0x2000000L, active1, 0L);
       case 124:
-         if ((active1 & 0x10000L) != 0L)
-            return jjStopAtPos(1, 80);
+         if ((active1 & 0x20000L) != 0L)
+            return jjStopAtPos(1, 81);
          break;
       default :
          break;
    }
    return jjStartNfa_0(0, active0, active1);
 }
-static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1){
+private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
       return jjStartNfa_0(0, old0, old1);
    try { curChar = input_stream.readChar(); }
@@ -338,14 +340,14 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
    switch(curChar)
    {
       case 46:
-         if ((active1 & 0x2L) != 0L)
-            return jjStopAtPos(2, 65);
+         if ((active1 & 0x4L) != 0L)
+            return jjStopAtPos(2, 66);
          break;
       case 61:
-         if ((active1 & 0x400L) != 0L)
-            return jjStopAtPos(2, 74);
-         else if ((active1 & 0x800L) != 0L)
+         if ((active1 & 0x800L) != 0L)
             return jjStopAtPos(2, 75);
+         else if ((active1 & 0x1000L) != 0L)
+            return jjStopAtPos(2, 76);
          break;
       case 97:
          return jjMoveStringLiteralDfa3_0(active0, 0x800200000000L, active1, 0L);
@@ -369,13 +371,13 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
          return jjMoveStringLiteralDfa3_0(active0, 0x2000000L, active1, 0L);
       case 114:
          if ((active0 & 0x2000000000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 49, 41);
+            return jjStartNfaWithStates_0(2, 49, 76);
          return jjMoveStringLiteralDfa3_0(active0, 0x100000000L, active1, 0L);
       case 115:
          return jjMoveStringLiteralDfa3_0(active0, 0x60001000000L, active1, 0L);
       case 116:
          if ((active0 & 0x4000000000000L) != 0L)
-            return jjStartNfaWithStates_0(2, 50, 41);
+            return jjStartNfaWithStates_0(2, 50, 76);
          return jjMoveStringLiteralDfa3_0(active0, 0x12000c0000000L, active1, 0L);
       case 117:
          return jjMoveStringLiteralDfa3_0(active0, 0x100008000000L, active1, 0L);
@@ -386,7 +388,7 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1,
    }
    return jjStartNfa_0(1, active0, active1);
 }
-static private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1){
+private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1){
    if (((active0 &= old0) | (active1 &= old1)) == 0L)
       return jjStartNfa_0(1, old0, old1);
    try { curChar = input_stream.readChar(); }
@@ -402,19 +404,19 @@ static private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1,
          return jjMoveStringLiteralDfa4_0(active0, 0x8000000L);
       case 100:
          if ((active0 & 0x400000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 46, 41);
+            return jjStartNfaWithStates_0(3, 46, 76);
          break;
       case 101:
          if ((active0 & 0x20000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 41, 41);
+            return jjStartNfaWithStates_0(3, 41, 76);
          else if ((active0 & 0x40000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 42, 41);
+            return jjStartNfaWithStates_0(3, 42, 76);
          else if ((active0 & 0x20000000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 53, 41);
+            return jjStartNfaWithStates_0(3, 53, 76);
          return jjMoveStringLiteralDfa4_0(active0, 0x92000000L);
       case 103:
          if ((active0 & 0x80000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 43, 41);
+            return jjStartNfaWithStates_0(3, 43, 76);
          break;
       case 105:
          return jjMoveStringLiteralDfa4_0(active0, 0x1800000L);
@@ -422,19 +424,19 @@ static private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1,
          return jjMoveStringLiteralDfa4_0(active0, 0x800000000L);
       case 109:
          if ((active0 & 0x100000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 44, 41);
+            return jjStartNfaWithStates_0(3, 44, 76);
          break;
       case 110:
          return jjMoveStringLiteralDfa4_0(active0, 0x400000000L);
       case 111:
          if ((active0 & 0x200000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 45, 41);
+            return jjStartNfaWithStates_0(3, 45, 76);
          else if ((active0 & 0x1000000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 48, 41);
+            return jjStartNfaWithStates_0(3, 48, 76);
          return jjMoveStringLiteralDfa4_0(active0, 0x2000000000L);
       case 114:
          if ((active0 & 0x800000000000L) != 0L)
-            return jjStartNfaWithStates_0(3, 47, 41);
+            return jjStartNfaWithStates_0(3, 47, 76);
          return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L);
       case 115:
          return jjMoveStringLiteralDfa4_0(active0, 0x4000000000L);
@@ -447,7 +449,7 @@ static private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1,
    }
    return jjStartNfa_0(2, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa4_0(long old0, long active0){
+private int jjMoveStringLiteralDfa4_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(2, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -463,7 +465,7 @@ static private int jjMoveStringLiteralDfa4_0(long old0, long active0){
          return jjMoveStringLiteralDfa5_0(active0, 0x2000000L);
       case 101:
          if ((active0 & 0x800000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 35, 41);
+            return jjStartNfaWithStates_0(4, 35, 76);
          return jjMoveStringLiteralDfa5_0(active0, 0x400000000L);
       case 103:
          return jjMoveStringLiteralDfa5_0(active0, 0x1000000L);
@@ -471,13 +473,13 @@ static private int jjMoveStringLiteralDfa4_0(long old0, long active0){
          return jjMoveStringLiteralDfa5_0(active0, 0x200200000L);
       case 107:
          if ((active0 & 0x1000000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 36, 41);
+            return jjStartNfaWithStates_0(4, 36, 76);
          break;
       case 108:
          return jjMoveStringLiteralDfa5_0(active0, 0x8000000L);
       case 110:
          if ((active0 & 0x2000000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 37, 41);
+            return jjStartNfaWithStates_0(4, 37, 76);
          break;
       case 111:
          return jjMoveStringLiteralDfa5_0(active0, 0x10000000L);
@@ -487,11 +489,11 @@ static private int jjMoveStringLiteralDfa4_0(long old0, long active0){
          return jjMoveStringLiteralDfa5_0(active0, 0x800000L);
       case 116:
          if ((active0 & 0x4000000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 38, 41);
+            return jjStartNfaWithStates_0(4, 38, 76);
          else if ((active0 & 0x8000000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 39, 41);
+            return jjStartNfaWithStates_0(4, 39, 76);
          else if ((active0 & 0x10000000000L) != 0L)
-            return jjStartNfaWithStates_0(4, 40, 41);
+            return jjStartNfaWithStates_0(4, 40, 76);
          return jjMoveStringLiteralDfa5_0(active0, 0x400000L);
       case 117:
          return jjMoveStringLiteralDfa5_0(active0, 0x4000000L);
@@ -500,7 +502,7 @@ static private int jjMoveStringLiteralDfa4_0(long old0, long active0){
    }
    return jjStartNfa_0(3, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa5_0(long old0, long active0){
+private int jjMoveStringLiteralDfa5_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(3, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -512,23 +514,23 @@ static private int jjMoveStringLiteralDfa5_0(long old0, long active0){
    {
       case 99:
          if ((active0 & 0x200000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 33, 41);
+            return jjStartNfaWithStates_0(5, 33, 76);
          break;
       case 100:
          if ((active0 & 0x400000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 34, 41);
+            return jjStartNfaWithStates_0(5, 34, 76);
          break;
       case 101:
          if ((active0 & 0x8000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 27, 41);
+            return jjStartNfaWithStates_0(5, 27, 76);
          return jjMoveStringLiteralDfa6_0(active0, 0x2000000L);
       case 102:
          if ((active0 & 0x10000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 28, 41);
+            return jjStartNfaWithStates_0(5, 28, 76);
          break;
       case 104:
          if ((active0 & 0x20000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 29, 41);
+            return jjStartNfaWithStates_0(5, 29, 76);
          break;
       case 105:
          return jjMoveStringLiteralDfa6_0(active0, 0x400000L);
@@ -536,20 +538,20 @@ static private int jjMoveStringLiteralDfa5_0(long old0, long active0){
          return jjMoveStringLiteralDfa6_0(active0, 0x4000000L);
       case 110:
          if ((active0 & 0x40000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 30, 41);
+            return jjStartNfaWithStates_0(5, 30, 76);
          else if ((active0 & 0x80000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 31, 41);
+            return jjStartNfaWithStates_0(5, 31, 76);
          return jjMoveStringLiteralDfa6_0(active0, 0x1200000L);
       case 116:
          if ((active0 & 0x100000000L) != 0L)
-            return jjStartNfaWithStates_0(5, 32, 41);
+            return jjStartNfaWithStates_0(5, 32, 76);
          return jjMoveStringLiteralDfa6_0(active0, 0x800000L);
       default :
          break;
    }
    return jjStartNfa_0(4, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa6_0(long old0, long active0){
+private int jjMoveStringLiteralDfa6_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(4, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -563,13 +565,13 @@ static private int jjMoveStringLiteralDfa6_0(long old0, long active0){
          return jjMoveStringLiteralDfa7_0(active0, 0x1800000L);
       case 102:
          if ((active0 & 0x2000000L) != 0L)
-            return jjStartNfaWithStates_0(6, 25, 41);
+            return jjStartNfaWithStates_0(6, 25, 76);
          break;
       case 108:
          return jjMoveStringLiteralDfa7_0(active0, 0x400000L);
       case 116:
          if ((active0 & 0x4000000L) != 0L)
-            return jjStartNfaWithStates_0(6, 26, 41);
+            return jjStartNfaWithStates_0(6, 26, 76);
          break;
       case 117:
          return jjMoveStringLiteralDfa7_0(active0, 0x200000L);
@@ -578,7 +580,7 @@ static private int jjMoveStringLiteralDfa6_0(long old0, long active0){
    }
    return jjStartNfa_0(5, active0, 0L);
 }
-static private int jjMoveStringLiteralDfa7_0(long old0, long active0){
+private int jjMoveStringLiteralDfa7_0(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return jjStartNfa_0(5, old0, 0L);
    try { curChar = input_stream.readChar(); }
@@ -590,24 +592,24 @@ static private int jjMoveStringLiteralDfa7_0(long old0, long active0){
    {
       case 100:
          if ((active0 & 0x1000000L) != 0L)
-            return jjStartNfaWithStates_0(7, 24, 41);
+            return jjStartNfaWithStates_0(7, 24, 76);
          break;
       case 101:
          if ((active0 & 0x200000L) != 0L)
-            return jjStartNfaWithStates_0(7, 21, 41);
+            return jjStartNfaWithStates_0(7, 21, 76);
          else if ((active0 & 0x400000L) != 0L)
-            return jjStartNfaWithStates_0(7, 22, 41);
+            return jjStartNfaWithStates_0(7, 22, 76);
          break;
       case 114:
          if ((active0 & 0x800000L) != 0L)
-            return jjStartNfaWithStates_0(7, 23, 41);
+            return jjStartNfaWithStates_0(7, 23, 76);
          break;
       default :
          break;
    }
    return jjStartNfa_0(6, active0, 0L);
 }
-static private int jjStartNfaWithStates_0(int pos, int kind, int state)
+private int jjStartNfaWithStates_0(int pos, int kind, int state)
 {
    jjmatchedKind = kind;
    jjmatchedPos = pos;
@@ -618,10 +620,10 @@ static private int jjStartNfaWithStates_0(int pos, int kind, int state)
 static final long[] jjbitVec0 = {
    0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
 };
-static private int jjMoveNfa_0(int startState, int curPos)
+private int jjMoveNfa_0(int startState, int curPos)
 {
    int startsAt = 0;
-   jjnewStateCnt = 73;
+   jjnewStateCnt = 76;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -636,21 +638,39 @@ static private int jjMoveNfa_0(int startState, int curPos)
          {
             switch(jjstateSet[--i])
             {
+               case 65:
+                  if (curChar == 42)
+                     { jjCheckNAddTwoStates(71, 72); }
+                  else if (curChar == 47)
+                     { jjCheckNAddStates(0, 2); }
+                  break;
+               case 38:
+                  if ((0x3ff001000000000L & l) != 0L)
+                  {
+                     if (kind > 54)
+                        kind = 54;
+                     { jjCheckNAddTwoStates(41, 42); }
+                  }
+                  else if (curChar == 58)
+                     { jjCheckNAdd(43); }
+                  break;
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(0, 6); }
+                     { jjCheckNAddStates(3, 9); }
                   else if (curChar == 47)
-                     { jjAddStates(7, 8); }
+                     { jjAddStates(10, 11); }
+                  else if (curChar == 58)
+                     { jjCheckNAdd(43); }
                   else if (curChar == 36)
                   {
                      if (kind > 54)
                         kind = 54;
-                     { jjCheckNAdd(41); }
+                     { jjCheckNAddTwoStates(41, 42); }
                   }
                   else if (curChar == 34)
-                     { jjCheckNAddStates(9, 11); }
+                     { jjCheckNAddStates(12, 14); }
                   else if (curChar == 39)
-                     { jjAddStates(12, 13); }
+                     { jjAddStates(15, 16); }
                   else if (curChar == 46)
                      { jjCheckNAdd(4); }
                   if ((0x3fe000000000000L & l) != 0L)
@@ -663,29 +683,28 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   {
                      if (kind > 12)
                         kind = 12;
-                     { jjCheckNAddStates(14, 16); }
+                     { jjCheckNAddStates(17, 19); }
                   }
                   break;
-               case 62:
-                  if (curChar == 42)
-                     { jjCheckNAddTwoStates(68, 69); }
-                  else if (curChar == 47)
-                     { jjCheckNAddStates(17, 19); }
-                  break;
-               case 38:
-               case 41:
-                  if ((0x3ff001000000000L & l) == 0L)
-                     break;
-                  if (kind > 54)
-                     kind = 54;
-                  { jjCheckNAdd(41); }
-                  break;
                case 37:
-                  if ((0x3ff001000000000L & l) == 0L)
-                     break;
-                  if (kind > 54)
-                     kind = 54;
-                  { jjCheckNAdd(41); }
+                  if ((0x3ff001000000000L & l) != 0L)
+                  {
+                     if (kind > 54)
+                        kind = 54;
+                     { jjCheckNAddTwoStates(41, 42); }
+                  }
+                  else if (curChar == 58)
+                     { jjCheckNAdd(43); }
+                  break;
+               case 76:
+                  if ((0x3ff001000000000L & l) != 0L)
+                  {
+                     if (kind > 54)
+                        kind = 54;
+                     { jjCheckNAddTwoStates(41, 42); }
+                  }
+                  else if (curChar == 58)
+                     { jjCheckNAdd(43); }
                   break;
                case 1:
                   if ((0x3ff000000000000L & l) == 0L)
@@ -718,7 +737,7 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   break;
                case 9:
                   if (curChar == 39)
-                     { jjAddStates(12, 13); }
+                     { jjAddStates(15, 16); }
                   break;
                case 10:
                   if ((0xffffff7fffffdbffL & l) != 0L)
@@ -750,15 +769,15 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   break;
                case 18:
                   if (curChar == 34)
-                     { jjCheckNAddStates(9, 11); }
+                     { jjCheckNAddStates(12, 14); }
                   break;
                case 19:
                   if ((0xfffffffbffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(9, 11); }
+                     { jjCheckNAddStates(12, 14); }
                   break;
                case 21:
                   if ((0x8400002400L & l) != 0L)
-                     { jjCheckNAddStates(9, 11); }
+                     { jjCheckNAddStates(12, 14); }
                   break;
                case 22:
                   if (curChar == 34 && kind > 19)
@@ -770,7 +789,7 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   break;
                case 24:
                   if ((0xff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(9, 11); }
+                     { jjCheckNAddStates(12, 14); }
                   break;
                case 25:
                   if ((0xf000000000000L & l) != 0L)
@@ -782,7 +801,7 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   break;
                case 27:
                   if (curChar == 10)
-                     { jjCheckNAddStates(9, 11); }
+                     { jjCheckNAddStates(12, 14); }
                   break;
                case 28:
                   if (curChar == 13)
@@ -807,130 +826,152 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      break;
                   if (kind > 54)
                      kind = 54;
-                  { jjCheckNAdd(41); }
+                  { jjCheckNAddTwoStates(41, 42); }
+                  break;
+               case 41:
+                  if ((0x3ff001000000000L & l) == 0L)
+                     break;
+                  if (kind > 54)
+                     kind = 54;
+                  { jjCheckNAddTwoStates(41, 42); }
                   break;
                case 42:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(0, 6); }
+                  if (curChar == 58)
+                     { jjCheckNAdd(43); }
                   break;
                case 43:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(43, 44); }
+                  if (curChar != 58)
+                     break;
+                  if (kind > 54)
+                     kind = 54;
+                  { jjCheckNAddTwoStates(41, 42); }
                   break;
                case 44:
+                  if (curChar == 58)
+                     { jjCheckNAdd(43); }
+                  break;
+               case 45:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(3, 9); }
+                  break;
+               case 46:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(46, 47); }
+                  break;
+               case 47:
                   if (curChar != 46)
                      break;
                   if (kind > 16)
                      kind = 16;
                   { jjCheckNAddStates(27, 29); }
                   break;
-               case 45:
+               case 48:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 16)
                      kind = 16;
                   { jjCheckNAddStates(27, 29); }
                   break;
-               case 47:
+               case 50:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(48); }
-                  break;
-               case 48:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 16)
-                     kind = 16;
-                  { jjCheckNAddTwoStates(48, 8); }
-                  break;
-               case 49:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(49, 50); }
+                     { jjCheckNAdd(51); }
                   break;
                case 51:
-                  if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(52); }
-                  break;
-               case 52:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 16)
                      kind = 16;
-                  { jjCheckNAddTwoStates(52, 8); }
+                  { jjCheckNAddTwoStates(51, 8); }
                   break;
-               case 53:
+               case 52:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(30, 32); }
+                     { jjCheckNAddTwoStates(52, 53); }
+                  break;
+               case 54:
+                  if ((0x280000000000L & l) != 0L)
+                     { jjCheckNAdd(55); }
                   break;
                case 55:
-                  if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(56); }
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 16)
+                     kind = 16;
+                  { jjCheckNAddTwoStates(55, 8); }
                   break;
                case 56:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(56, 8); }
+                     { jjCheckNAddStates(30, 32); }
                   break;
-               case 57:
+               case 58:
+                  if ((0x280000000000L & l) != 0L)
+                     { jjCheckNAdd(59); }
+                  break;
+               case 59:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(59, 8); }
+                  break;
+               case 60:
                   if (curChar != 48)
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAddStates(14, 16); }
+                  { jjCheckNAddStates(17, 19); }
                   break;
-               case 59:
+               case 62:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAddTwoStates(59, 2); }
+                  { jjCheckNAddTwoStates(62, 2); }
                   break;
-               case 60:
+               case 63:
                   if ((0xff000000000000L & l) == 0L)
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAddTwoStates(60, 2); }
-                  break;
-               case 61:
-                  if (curChar == 47)
-                     { jjAddStates(7, 8); }
-                  break;
-               case 63:
-                  if ((0xffffffffffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(17, 19); }
+                  { jjCheckNAddTwoStates(63, 2); }
                   break;
                case 64:
+                  if (curChar == 47)
+                     { jjAddStates(10, 11); }
+                  break;
+               case 66:
+                  if ((0xffffffffffffdbffL & l) != 0L)
+                     { jjCheckNAddStates(0, 2); }
+                  break;
+               case 67:
                   if ((0x2400L & l) != 0L && kind > 5)
                      kind = 5;
                   break;
-               case 65:
+               case 68:
                   if (curChar == 10 && kind > 5)
                      kind = 5;
                   break;
-               case 66:
-                  if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 65;
-                  break;
-               case 67:
-                  if (curChar == 42)
-                     { jjCheckNAddTwoStates(68, 69); }
-                  break;
-               case 68:
-                  if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(68, 69); }
-                  break;
                case 69:
-                  if (curChar == 42)
-                     { jjCheckNAddStates(33, 35); }
+                  if (curChar == 13)
+                     jjstateSet[jjnewStateCnt++] = 68;
                   break;
                case 70:
-                  if ((0xffff7bffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(71, 69); }
+                  if (curChar == 42)
+                     { jjCheckNAddTwoStates(71, 72); }
                   break;
                case 71:
                   if ((0xfffffbffffffffffL & l) != 0L)
-                     { jjCheckNAddTwoStates(71, 69); }
+                     { jjCheckNAddTwoStates(71, 72); }
                   break;
                case 72:
+                  if (curChar == 42)
+                     { jjCheckNAddStates(33, 35); }
+                  break;
+               case 73:
+                  if ((0xffff7bffffffffffL & l) != 0L)
+                     { jjCheckNAddTwoStates(74, 72); }
+                  break;
+               case 74:
+                  if ((0xfffffbffffffffffL & l) != 0L)
+                     { jjCheckNAddTwoStates(74, 72); }
+                  break;
+               case 75:
                   if (curChar == 47 && kind > 6)
                      kind = 6;
                   break;
@@ -945,36 +986,44 @@ static private int jjMoveNfa_0(int startState, int curPos)
          {
             switch(jjstateSet[--i])
             {
-               case 0:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
-                  {
-                     if (kind > 54)
-                        kind = 54;
-                     { jjCheckNAdd(41); }
-                  }
-                  if (curChar == 117)
-                     jjstateSet[jjnewStateCnt++] = 38;
-                  break;
                case 38:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
                      if (kind > 54)
                         kind = 54;
-                     { jjCheckNAdd(41); }
+                     { jjCheckNAddTwoStates(41, 42); }
                   }
                   if (curChar == 110)
                      jjstateSet[jjnewStateCnt++] = 37;
                   break;
+               case 0:
+                  if ((0x7fffffe87fffffeL & l) != 0L)
+                  {
+                     if (kind > 54)
+                        kind = 54;
+                     { jjCheckNAddTwoStates(41, 42); }
+                  }
+                  if (curChar == 117)
+                     jjstateSet[jjnewStateCnt++] = 38;
+                  break;
                case 37:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
                      if (kind > 54)
                         kind = 54;
-                     { jjCheckNAdd(41); }
+                     { jjCheckNAddTwoStates(41, 42); }
                   }
                   if (curChar == 100)
                      jjstateSet[jjnewStateCnt++] = 36;
                   break;
+               case 76:
+               case 41:
+                  if ((0x7fffffe87fffffeL & l) == 0L)
+                     break;
+                  if (kind > 54)
+                     kind = 54;
+                  { jjCheckNAddTwoStates(41, 42); }
+                  break;
                case 2:
                   if ((0x100000001000L & l) != 0L && kind > 12)
                      kind = 12;
@@ -1001,7 +1050,7 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   break;
                case 19:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(9, 11); }
+                     { jjCheckNAddStates(12, 14); }
                   break;
                case 20:
                   if (curChar == 92)
@@ -1009,7 +1058,7 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   break;
                case 21:
                   if ((0x14404410000000L & l) != 0L)
-                     { jjCheckNAddStates(9, 11); }
+                     { jjCheckNAddStates(12, 14); }
                   break;
                case 29:
                   if (curChar != 100)
@@ -1047,47 +1096,40 @@ static private int jjMoveNfa_0(int startState, int curPos)
                      break;
                   if (kind > 54)
                      kind = 54;
-                  { jjCheckNAdd(41); }
+                  { jjCheckNAddTwoStates(41, 42); }
                   break;
-               case 41:
-                  if ((0x7fffffe87fffffeL & l) == 0L)
-                     break;
-                  if (kind > 54)
-                     kind = 54;
-                  { jjCheckNAdd(41); }
-                  break;
-               case 46:
+               case 49:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(45, 46); }
                   break;
-               case 50:
+               case 53:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(47, 48); }
                   break;
-               case 54:
+               case 57:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(49, 50); }
                   break;
-               case 58:
+               case 61:
                   if ((0x100000001000000L & l) != 0L)
-                     { jjCheckNAdd(59); }
+                     { jjCheckNAdd(62); }
                   break;
-               case 59:
+               case 62:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAddTwoStates(59, 2); }
+                  { jjCheckNAddTwoStates(62, 2); }
                   break;
-               case 63:
-                  { jjAddStates(17, 19); }
+               case 66:
+                  { jjAddStates(0, 2); }
                   break;
-               case 68:
-                  { jjCheckNAddTwoStates(68, 69); }
-                  break;
-               case 70:
                case 71:
-                  { jjCheckNAddTwoStates(71, 69); }
+                  { jjCheckNAddTwoStates(71, 72); }
+                  break;
+               case 73:
+               case 74:
+                  { jjCheckNAddTwoStates(74, 72); }
                   break;
                default : break;
             }
@@ -1107,20 +1149,20 @@ static private int jjMoveNfa_0(int startState, int curPos)
                   break;
                case 19:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     { jjAddStates(9, 11); }
+                     { jjAddStates(12, 14); }
                   break;
-               case 63:
+               case 66:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     { jjAddStates(17, 19); }
+                     { jjAddStates(0, 2); }
                   break;
-               case 68:
-                  if ((jjbitVec0[i2] & l2) != 0L)
-                     { jjCheckNAddTwoStates(68, 69); }
-                  break;
-               case 70:
                case 71:
                   if ((jjbitVec0[i2] & l2) != 0L)
-                     { jjCheckNAddTwoStates(71, 69); }
+                     { jjCheckNAddTwoStates(71, 72); }
+                  break;
+               case 73:
+               case 74:
+                  if ((jjbitVec0[i2] & l2) != 0L)
+                     { jjCheckNAddTwoStates(74, 72); }
                   break;
                default : break;
             }
@@ -1133,13 +1175,13 @@ static private int jjMoveNfa_0(int startState, int curPos)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 73 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 76 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
    }
 }
-static private int jjMoveStringLiteralDfa0_1(){
+private int jjMoveStringLiteralDfa0_1(){
    switch(curChar)
    {
       case 10:
@@ -1150,7 +1192,7 @@ static private int jjMoveStringLiteralDfa0_1(){
          return 1;
    }
 }
-static private int jjMoveStringLiteralDfa1_1(long active0){
+private int jjMoveStringLiteralDfa1_1(long active0){
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
       return 1;
@@ -1168,7 +1210,7 @@ static private int jjMoveStringLiteralDfa1_1(long active0){
    }
    return 2;
 }
-static private int jjMoveStringLiteralDfa2_1(long old0, long active0){
+private int jjMoveStringLiteralDfa2_1(long old0, long active0){
    if (((active0 &= old0)) == 0L)
       return 2;
    try { curChar = input_stream.readChar(); }
@@ -1199,13 +1241,13 @@ null, null, null, null, null, null, null, null, "\143\157\156\164\151\156\165\14
 "\143\157\156\163\164", "\146\154\157\141\164", "\163\150\157\162\164", "\145\154\163\145", 
 "\143\141\163\145", "\154\157\156\147", "\145\156\165\155", "\141\165\164\157", 
 "\166\157\151\144", "\143\150\141\162", "\147\157\164\157", "\146\157\162", "\151\156\164", 
-"\151\146", "\144\157", "\143\157\144\145", null, null, null, "\73", "\54", "\75", "\50", 
-"\51", "\133", "\135", "\52", "\56\56\56", "\173", "\175", "\72", "\52\75", "\57\75", 
-"\45\75", "\53\75", "\55\75", "\74\74\75", "\76\76\75", "\46\75", "\136\75", "\174\75", 
-"\77", "\174\174", "\46\46", "\174", "\136", "\46", "\75\75", "\41\75", "\74", "\76", 
-"\74\75", "\76\75", "\74\74", "\76\76", "\53", "\55", "\57", "\45", "\53\53", "\55\55", 
-"\176", "\41", "\56", "\55\76", };
-static protected Token jjFillToken()
+"\151\146", "\144\157", "\143\157\144\145", null, null, null, null, "\73", "\54", "\75", 
+"\50", "\51", "\133", "\135", "\52", "\56\56\56", "\173", "\175", "\72", "\52\75", 
+"\57\75", "\45\75", "\53\75", "\55\75", "\74\74\75", "\76\76\75", "\46\75", "\136\75", 
+"\174\75", "\77", "\174\174", "\46\46", "\174", "\136", "\46", "\75\75", "\41\75", "\74", 
+"\76", "\74\75", "\76\75", "\74\74", "\76\76", "\53", "\55", "\57", "\45", "\53\53", 
+"\55\55", "\176", "\41", "\56", "\55\76", };
+protected Token jjFillToken()
 {
    final Token t;
    final String curTokenImage;
@@ -1229,21 +1271,21 @@ static protected Token jjFillToken()
    return t;
 }
 static final int[] jjnextStates = {
-   43, 44, 49, 50, 53, 54, 8, 62, 67, 19, 20, 22, 10, 12, 58, 60, 
-   2, 63, 64, 66, 4, 5, 8, 19, 20, 24, 22, 45, 46, 8, 53, 54, 
-   8, 69, 70, 72, 6, 7, 13, 14, 16, 21, 23, 25, 28, 47, 48, 51, 
-   52, 55, 56, 
+   66, 67, 69, 46, 47, 52, 53, 56, 57, 8, 65, 70, 19, 20, 22, 10, 
+   12, 61, 63, 2, 4, 5, 8, 19, 20, 24, 22, 48, 49, 8, 56, 57, 
+   8, 72, 73, 75, 6, 7, 13, 14, 16, 21, 23, 25, 28, 50, 51, 54, 
+   55, 58, 59, 
 };
 
-static int curLexState = 0;
-static int defaultLexState = 0;
-static int jjnewStateCnt;
-static int jjround;
-static int jjmatchedPos;
-static int jjmatchedKind;
+int curLexState = 0;
+int defaultLexState = 0;
+int jjnewStateCnt;
+int jjround;
+int jjmatchedPos;
+int jjmatchedKind;
 
 /** Get the next Token. */
-public static Token getNextToken() 
+public Token getNextToken() 
 {
   Token matchedToken;
   int curPos = 0;
@@ -1338,7 +1380,7 @@ public static Token getNextToken()
   }
 }
 
-static void SkipLexicalActions(Token matchedToken)
+void SkipLexicalActions(Token matchedToken)
 {
    switch(jjmatchedKind)
    {
@@ -1346,7 +1388,7 @@ static void SkipLexicalActions(Token matchedToken)
          break;
    }
 }
-static void MoreLexicalActions()
+void MoreLexicalActions()
 {
    jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
    switch(jjmatchedKind)
@@ -1355,7 +1397,7 @@ static void MoreLexicalActions()
          break;
    }
 }
-static void TokenLexicalActions(Token matchedToken)
+void TokenLexicalActions(Token matchedToken)
 {
    switch(jjmatchedKind)
    {
@@ -1363,7 +1405,7 @@ static void TokenLexicalActions(Token matchedToken)
          break;
    }
 }
-static private void jjCheckNAdd(int state)
+private void jjCheckNAdd(int state)
 {
    if (jjrounds[state] != jjround)
    {
@@ -1371,19 +1413,19 @@ static private void jjCheckNAdd(int state)
       jjrounds[state] = jjround;
    }
 }
-static private void jjAddStates(int start, int end)
+private void jjAddStates(int start, int end)
 {
    do {
       jjstateSet[jjnewStateCnt++] = jjnextStates[start];
    } while (start++ != end);
 }
-static private void jjCheckNAddTwoStates(int state1, int state2)
+private void jjCheckNAddTwoStates(int state1, int state2)
 {
    jjCheckNAdd(state1);
    jjCheckNAdd(state2);
 }
 
-static private void jjCheckNAddStates(int start, int end)
+private void jjCheckNAddStates(int start, int end)
 {
    do {
       jjCheckNAdd(jjnextStates[start]);
@@ -1393,8 +1435,8 @@ static private void jjCheckNAddStates(int start, int end)
     /** Constructor. */
     public CParserTokenManager(SimpleCharStream stream){
 
-      if (input_stream != null)
-        throw new TokenMgrError("ERROR: Second call to constructor of static lexer. You must use ReInit() to initialize the static variables.", TokenMgrError.STATIC_LEXER_ERROR);
+      if (SimpleCharStream.staticFlag)
+            throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
 
     input_stream = stream;
   }
@@ -1407,7 +1449,7 @@ static private void jjCheckNAddStates(int start, int end)
 
   /** Reinitialise parser. */
   
-  static public void ReInit(SimpleCharStream stream)
+  public void ReInit(SimpleCharStream stream)
   {
 
 
@@ -1419,16 +1461,16 @@ static private void jjCheckNAddStates(int start, int end)
     ReInitRounds();
   }
 
-  static private void ReInitRounds()
+  private void ReInitRounds()
   {
     int i;
     jjround = 0x80000001;
-    for (i = 73; i-- > 0;)
+    for (i = 76; i-- > 0;)
       jjrounds[i] = 0x80000000;
   }
 
   /** Reinitialise parser. */
-  static public void ReInit(SimpleCharStream stream, int lexState)
+  public void ReInit(SimpleCharStream stream, int lexState)
   
   {
     ReInit(stream);
@@ -1436,7 +1478,7 @@ static private void jjCheckNAddStates(int start, int end)
   }
 
   /** Switch to specified lex state. */
-  public static void SwitchTo(int lexState)
+  public void SwitchTo(int lexState)
   {
     if (lexState >= 2 || lexState < 0)
       throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
@@ -1457,10 +1499,10 @@ public static final int[] jjnewLexState = {
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-   -1, -1, -1, 
+   -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0xfe7ffffffffd1001L, 0x7fffffffffL, 
+   0xfc7ffffffffd1001L, 0xffffffffffL, 
 };
 static final long[] jjtoSkip = {
    0x1feL, 0x0L, 
@@ -1471,13 +1513,13 @@ static final long[] jjtoSpecial = {
 static final long[] jjtoMore = {
    0xe00L, 0x0L, 
 };
-    static protected SimpleCharStream  input_stream;
+    protected SimpleCharStream  input_stream;
 
-    static private final int[] jjrounds = new int[73];
-    static private final int[] jjstateSet = new int[2 * 73];
-    private static final StringBuilder jjimage = new StringBuilder();
-    private static StringBuilder image = jjimage;
-    private static int jjimageLen;
-    private static int lengthOfMatch;
-    static protected int curChar;
+    private final int[] jjrounds = new int[76];
+    private final int[] jjstateSet = new int[2 * 76];
+    private final StringBuilder jjimage = new StringBuilder();
+    private StringBuilder image = jjimage;
+    private int jjimageLen;
+    private int lengthOfMatch;
+    protected int curChar;
 }
diff --git a/src/main/java/ghidrust/decompiler/parser/c/gen/SimpleCharStream.java b/src/main/java/ghidrust/decompiler/parser/c/gen/SimpleCharStream.java
index 700f448..8915f4c 100644
--- a/src/main/java/ghidrust/decompiler/parser/c/gen/SimpleCharStream.java
+++ b/src/main/java/ghidrust/decompiler/parser/c/gen/SimpleCharStream.java
@@ -1,7 +1,7 @@
 package ghidrust.decompiler.parser.c.gen;
 
 /* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 7.0 */
-/* JavaCCOptions:STATIC=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+/* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 /**
  * An implementation of interface CharStream, where the stream is assumed to
  * contain only ASCII characters (without unicode processing).
@@ -10,35 +10,35 @@ package ghidrust.decompiler.parser.c.gen;
 public class SimpleCharStream
 {
 /** Whether parser is static. */
-  public static final boolean staticFlag = true;
-  static int bufsize;
-  static int available;
-  static int tokenBegin;
+  public static final boolean staticFlag = false;
+  int bufsize;
+  int available;
+  int tokenBegin;
 /** Position in buffer. */
-  static public int bufpos = -1;
-  static protected int bufline[];
-  static protected int bufcolumn[];
+  public int bufpos = -1;
+  protected int bufline[];
+  protected int bufcolumn[];
 
-  static protected int column = 0;
-  static protected int line = 1;
+  protected int column = 0;
+  protected int line = 1;
 
-  static protected boolean prevCharIsCR = false;
-  static protected boolean prevCharIsLF = false;
+  protected boolean prevCharIsCR = false;
+  protected boolean prevCharIsLF = false;
 
-  static protected java.io.Reader inputStream;
+  protected java.io.Reader inputStream;
 
-  static protected char[] buffer;
-  static protected int maxNextCharInd = 0;
-  static protected int inBuf = 0;
-  static protected int tabSize = 1;
-  static protected boolean trackLineColumn = true;
+  protected char[] buffer;
+  protected int maxNextCharInd = 0;
+  protected int inBuf = 0;
+  protected int tabSize = 1;
+  protected boolean trackLineColumn = true;
 
-  static public void setTabSize(int i) { tabSize = i; }
-  static public int getTabSize() { return tabSize; }
+  public void setTabSize(int i) { tabSize = i; }
+  public int getTabSize() { return tabSize; }
 
 
 
-  static protected void ExpandBuff(boolean wrapAround)
+  protected void ExpandBuff(boolean wrapAround)
   {
     char[] newbuffer = new char[bufsize + 2048];
     int newbufline[] = new int[bufsize + 2048];
@@ -87,7 +87,7 @@ public class SimpleCharStream
     tokenBegin = 0;
   }
 
-  static protected void FillBuff() throws java.io.IOException
+  protected void FillBuff() throws java.io.IOException
   {
     if (maxNextCharInd == available)
     {
@@ -132,7 +132,7 @@ public class SimpleCharStream
   }
 
 /** Start. */
-  static public char BeginToken() throws java.io.IOException
+  public char BeginToken() throws java.io.IOException
   {
     tokenBegin = -1;
     char c = readChar();
@@ -141,7 +141,7 @@ public class SimpleCharStream
     return c;
   }
 
-  static protected void UpdateLineColumn(char c)
+  protected void UpdateLineColumn(char c)
   {
     column++;
 
@@ -182,7 +182,7 @@ public class SimpleCharStream
   }
 
 /** Read a character. */
-  static public char readChar() throws java.io.IOException
+  public char readChar() throws java.io.IOException
   {
     if (inBuf > 0)
     {
@@ -209,7 +209,7 @@ public class SimpleCharStream
    * @see #getEndColumn
    */
 
-  static public int getColumn() {
+  public int getColumn() {
     return bufcolumn[bufpos];
   }
 
@@ -219,32 +219,32 @@ public class SimpleCharStream
    * @see #getEndLine
    */
 
-  static public int getLine() {
+  public int getLine() {
     return bufline[bufpos];
   }
 
   /** Get token end column number. */
-  static public int getEndColumn() {
+  public int getEndColumn() {
     return bufcolumn[bufpos];
   }
 
   /** Get token end line number. */
-  static public int getEndLine() {
+  public int getEndLine() {
      return bufline[bufpos];
   }
 
   /** Get token beginning column number. */
-  static public int getBeginColumn() {
+  public int getBeginColumn() {
     return bufcolumn[tokenBegin];
   }
 
   /** Get token beginning line number. */
-  static public int getBeginLine() {
+  public int getBeginLine() {
     return bufline[tokenBegin];
   }
 
 /** Backup a number of characters. */
-  static public void backup(int amount) {
+  public void backup(int amount) {
 
     inBuf += amount;
     if ((bufpos -= amount) < 0)
@@ -255,10 +255,6 @@ public class SimpleCharStream
   public SimpleCharStream(java.io.Reader dstream, int startline,
   int startcolumn, int buffersize)
   {
-    if (inputStream != null)
-      throw new Error("\n   ERROR: Second call to the constructor of a static SimpleCharStream.\n" +
-      "       You must either use ReInit() or set the JavaCC option STATIC to false\n" +
-      "       during the generation of this class.");
     inputStream = dstream;
     line = startline;
     column = startcolumn - 1;
@@ -392,7 +388,7 @@ public class SimpleCharStream
     ReInit(dstream, startline, startcolumn, 4096);
   }
   /** Get token literal value. */
-  static public String GetImage()
+  public String GetImage()
   {
     if (bufpos >= tokenBegin)
       return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
@@ -402,7 +398,7 @@ public class SimpleCharStream
   }
 
   /** Get the suffix. */
-  static public char[] GetSuffix(int len)
+  public char[] GetSuffix(int len)
   {
     char[] ret = new char[len];
 
@@ -419,7 +415,7 @@ public class SimpleCharStream
   }
 
   /** Reset buffer when finished. */
-  static public void Done()
+  public void Done()
   {
     buffer = null;
     bufline = null;
@@ -429,7 +425,7 @@ public class SimpleCharStream
   /**
    * Method to adjust line and column numbers for the start of a token.
    */
-  static public void adjustBeginLineColumn(int newLine, int newCol)
+  public void adjustBeginLineColumn(int newLine, int newCol)
   {
     int start = tokenBegin;
     int len;
@@ -472,7 +468,7 @@ public class SimpleCharStream
     line = bufline[j];
     column = bufcolumn[j];
   }
-  static boolean getTrackLineColumn() { return trackLineColumn; }
-  static void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
+  boolean getTrackLineColumn() { return trackLineColumn; }
+  void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
 }
-/* JavaCC - OriginalChecksum=052d2c8783a7a693ccde91d90feb1d3b (do not edit this line) */
+/* JavaCC - OriginalChecksum=320e3957affec8972ad656fb86b8d782 (do not edit this line) */
diff --git a/src/main/java/ghidrust/decompiler/parser/c/gen/c.jj b/src/main/java/ghidrust/decompiler/parser/c/gen/c.jj
index 45d1a1d..30c638e 100644
--- a/src/main/java/ghidrust/decompiler/parser/c/gen/c.jj
+++ b/src/main/java/ghidrust/decompiler/parser/c/gen/c.jj
@@ -12,6 +12,7 @@ From: https://github.com/javacc/javacc/blob/master/grammars/CParser.jj
 options {
 	             
 	               
+	STATIC = false;
 }
 
 PARSER_BEGIN(CParser)
@@ -22,7 +23,7 @@ import java.nio.charset.StandardCharsets;
 import ghidrust.decompiler.parser.c.CVisitor;
 
 public class CParser/*@bgen(jjtree)*/implements CParserTreeConstants/*@egen*/ {/*@bgen(jjtree)*/
-  protected static JJTCParserState jjtree = new JJTCParserState();
+  protected JJTCParserState jjtree = new JJTCParserState();
 
 /*@egen*/
 	private static CParser c_parser;
@@ -123,9 +124,10 @@ TOKEN : {
 }
 
 TOKEN : {
-	<IDENTIFIER: <LETTER> (<LETTER> | <DIGIT>)*>
+	<IDENTIFIER: (<LETTER> | <SEPARATOR> <SEPARATOR>) (<LETTER> | <SEPARATOR> <SEPARATOR> | <DIGIT>)*>
 	|  <#LETTER: ["$","A"-"Z","_","a"-"z"]>
 	|  <#DIGIT: ["0"-"9"]>
+	|  <#SEPARATOR: [":"]>
 }
 
 
diff --git a/src/main/java/ghidrust/decompiler/parser/c/gen/c.jjt b/src/main/java/ghidrust/decompiler/parser/c/gen/c.jjt
index fdd4965..01cbb24 100644
--- a/src/main/java/ghidrust/decompiler/parser/c/gen/c.jjt
+++ b/src/main/java/ghidrust/decompiler/parser/c/gen/c.jjt
@@ -11,6 +11,7 @@ From: https://github.com/javacc/javacc/blob/master/grammars/CParser.jj
 options {
 	MULTI = true;
 	VISITOR = true;
+	STATIC = false;
 }
 
 PARSER_BEGIN(CParser)
@@ -119,9 +120,10 @@ TOKEN : {
 }
 
 TOKEN : {
-	<IDENTIFIER: <LETTER> (<LETTER> | <DIGIT>)*>
+	<IDENTIFIER: (<LETTER> | <SEPARATOR> <SEPARATOR>) (<LETTER> | <SEPARATOR> <SEPARATOR> | <DIGIT>)*>
 	|  <#LETTER: ["$","A"-"Z","_","a"-"z"]>
 	|  <#DIGIT: ["0"-"9"]>
+	|  <#SEPARATOR: [":"]>
 }