You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by zs...@apache.org on 2010/01/21 10:45:25 UTC

svn commit: r901621 [3/6] - /hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/

Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammar.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammar.java?rev=901621&r1=901620&r2=901621&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammar.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/thrift_grammar.java Thu Jan 21 09:45:20 2010
@@ -1,95 +1,103 @@
 /* Generated By:JJTree&JavaCC: Do not edit this line. thrift_grammar.java */
 package org.apache.hadoop.hive.serde2.dynamic_type;
 
-import java.util.*;
-import java.io.*;
-import java.net.*;
-import org.apache.thrift.protocol.*;
-import org.apache.thrift.transport.*;
-import org.apache.hadoop.hive.serde2.dynamic_type.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-public class thrift_grammar/*@bgen(jjtree)*/implements thrift_grammarTreeConstants, thrift_grammarConstants {/*@bgen(jjtree)*/
+public class thrift_grammar/* @bgen(jjtree) */implements
+    thrift_grammarTreeConstants, thrift_grammarConstants {/* @bgen(jjtree) */
   protected JJTthrift_grammarState jjtree = new JJTthrift_grammarState();
-    private List<String> include_path = null;
+  private List<String> include_path = null;
 
-    // for computing the autogenerated field ids in thrift
-    private  int field_val;
+  // for computing the autogenerated field ids in thrift
+  private int field_val;
 
-    // store types and tables
-    // separately because one cannot use a table (ie service.method) as a Struct like type.
-    protected Map<String,DynamicSerDeSimpleNode> types;
-    protected Map<String,DynamicSerDeSimpleNode> tables;
-
-    // system include path
-    final private static String default_include_path[] = {  "/usr/local/include","/usr/include","/usr/local/include/thrift/if","/usr/local/include/fb303/if" };
-
-    // need three params to differentiate between this and 2 param method auto generated since
-    // some calls in the autogenerated code use null param for 2nd param and thus ambiguous.
-    protected thrift_grammar(InputStream is, List<String> include_path, boolean junk) {
-        this(is,null);
-        this.types = new HashMap<String,DynamicSerDeSimpleNode> () ;
-        this.tables = new HashMap<String,DynamicSerDeSimpleNode> () ;
-        this.include_path = include_path;
-        this.field_val = -1;
-    }
-
-    // find the file on the include path
-    private static File findFile(String fname, List<String> include_path) {
-        for(String path: include_path) {
-            final String full = path + "/" + fname;
-            File f = new File(full);
-            if(f.exists()) {
-                return f;
-            }
-        }
-        return null;
+  // store types and tables
+  // separately because one cannot use a table (ie service.method) as a Struct
+  // like type.
+  protected Map<String, DynamicSerDeSimpleNode> types;
+  protected Map<String, DynamicSerDeSimpleNode> tables;
+
+  // system include path
+  final private static String default_include_path[] = { "/usr/local/include",
+      "/usr/include", "/usr/local/include/thrift/if",
+      "/usr/local/include/fb303/if" };
+
+  // need three params to differentiate between this and 2 param method auto
+  // generated since
+  // some calls in the autogenerated code use null param for 2nd param and thus
+  // ambiguous.
+  protected thrift_grammar(InputStream is, List<String> include_path,
+      boolean junk) {
+    this(is, null);
+    types = new HashMap<String, DynamicSerDeSimpleNode>();
+    tables = new HashMap<String, DynamicSerDeSimpleNode>();
+    this.include_path = include_path;
+    field_val = -1;
+  }
+
+  // find the file on the include path
+  private static File findFile(String fname, List<String> include_path) {
+    for (String path : include_path) {
+      final String full = path + "/" + fname;
+      File f = new File(full);
+      if (f.exists()) {
+        return f;
+      }
     }
+    return null;
+  }
 
-    public static void main(String args[]) {
-        String filename = null;
-        List<String> include_path = new ArrayList<String>();
+  public static void main(String args[]) {
+    String filename = null;
+    List<String> include_path = new ArrayList<String>();
 
-        for(String path: default_include_path)  {
-            include_path.add(path);
-        }
-        for(int i = 0; i < args.length; i++) {
-            String arg = args[i];
-            if(arg.equals("--include") && i + 1 < args.length) {
-                include_path.add(args[++i]);
-            }
-            if(arg.equals("--file") && i + 1 < args.length) {
-                filename = args[++i];
-            }
-        }
+    for (String path : default_include_path) {
+      include_path.add(path);
+    }
+    for (int i = 0; i < args.length; i++) {
+      String arg = args[i];
+      if (arg.equals("--include") && i + 1 < args.length) {
+        include_path.add(args[++i]);
+      }
+      if (arg.equals("--file") && i + 1 < args.length) {
+        filename = args[++i];
+      }
+    }
 
-        InputStream is = System.in;
-        if(filename != null) {
-            try {
-                  is = new FileInputStream(findFile(filename, include_path));
-            } catch(IOException e) {
-            }
-        }
-        thrift_grammar t = new thrift_grammar(is,include_path,false);
+    InputStream is = System.in;
+    if (filename != null) {
+      try {
+        is = new FileInputStream(findFile(filename, include_path));
+      } catch (IOException e) {
+      }
+    }
+    thrift_grammar t = new thrift_grammar(is, include_path, false);
 
-          try {
-            t.Start();
-        } catch (Exception e) {
-            System.out.println("Parse error.");
-            System.out.println(e.getMessage());
-            e.printStackTrace();
-        }
+    try {
+      t.Start();
+    } catch (Exception e) {
+      System.out.println("Parse error.");
+      System.out.println(e.getMessage());
+      e.printStackTrace();
     }
+  }
 
   final public SimpleNode Start() throws ParseException {
-                      /*@bgen(jjtree) Start */
-  DynamicSerDeStart jjtn000 = new DynamicSerDeStart(JJTSTART);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Start */
+    DynamicSerDeStart jjtn000 = new DynamicSerDeStart(JJTSTART);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       HeaderList();
-      label_1:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      label_1: while (true) {
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
         case 59:
         case 60:
           CommaOrSemicolon();
@@ -99,7 +107,7 @@
           ;
         }
         Definition();
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
         case tok_const:
         case tok_senum:
         case tok_typedef:
@@ -116,40 +124,55 @@
           break label_1;
         }
       }
-   jjtree.closeNodeScope(jjtn000, true);
-   jjtc000 = false;
-    {if (true) return jjtn000;}
-    } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
+      jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
+    } catch (Throwable jjte000) {
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode HeaderList() throws ParseException {
-                           /*@bgen(jjtree) HeaderList */
-  DynamicSerDeHeaderList jjtn000 = new DynamicSerDeHeaderList(JJTHEADERLIST);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
-    try {
-      label_2:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    /* @bgen(jjtree) HeaderList */
+    DynamicSerDeHeaderList jjtn000 = new DynamicSerDeHeaderList(JJTHEADERLIST);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
+    try {
+      label_2: while (true) {
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
         case tok_namespace:
         case tok_cpp_namespace:
         case tok_cpp_include:
@@ -172,43 +195,63 @@
         }
         Header();
       }
-   jjtree.closeNodeScope(jjtn000, true);
-   jjtc000 = false;
-    {if (true) return jjtn000;}
-    } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
+      jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
+    } catch (Throwable jjte000) {
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode Header() throws ParseException {
-                       /*@bgen(jjtree) Header */
-  DynamicSerDeHeader jjtn000 = new DynamicSerDeHeader(JJTHEADER);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Header */
+    DynamicSerDeHeader jjtn000 = new DynamicSerDeHeader(JJTHEADER);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case tok_include:
         Include();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_namespace:
       case tok_cpp_namespace:
@@ -224,9 +267,13 @@
       case tok_smalltalk_prefix:
       case tok_xsd_namespace:
         Namespace();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       default:
         jj_la1[3] = jj_gen;
@@ -234,125 +281,189 @@
         throw new ParseException();
       }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode Namespace() throws ParseException {
-                          /*@bgen(jjtree) Namespace */
-  DynamicSerDeNamespace jjtn000 = new DynamicSerDeNamespace(JJTNAMESPACE);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Namespace */
+    DynamicSerDeNamespace jjtn000 = new DynamicSerDeNamespace(JJTNAMESPACE);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case tok_namespace:
         jj_consume_token(tok_namespace);
         jj_consume_token(IDENTIFIER);
         jj_consume_token(IDENTIFIER);
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-  {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_cpp_namespace:
         jj_consume_token(tok_cpp_namespace);
         jj_consume_token(IDENTIFIER);
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-  {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_cpp_include:
         jj_consume_token(tok_cpp_include);
         jj_consume_token(tok_literal);
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-  {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_php_namespace:
         jj_consume_token(tok_php_namespace);
         jj_consume_token(IDENTIFIER);
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-  {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_py_module:
         jj_consume_token(tok_py_module);
         jj_consume_token(IDENTIFIER);
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-  {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_perl_package:
         jj_consume_token(tok_perl_package);
         jj_consume_token(IDENTIFIER);
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-  {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_ruby_namespace:
         jj_consume_token(tok_ruby_namespace);
         jj_consume_token(IDENTIFIER);
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-  {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_smalltalk_category:
         jj_consume_token(tok_smalltalk_category);
         jj_consume_token(tok_st_identifier);
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-  {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_smalltalk_prefix:
         jj_consume_token(tok_smalltalk_prefix);
         jj_consume_token(IDENTIFIER);
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-  {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_java_package:
         jj_consume_token(tok_java_package);
         jj_consume_token(IDENTIFIER);
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-  {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_cocoa_prefix:
         jj_consume_token(tok_cocoa_prefix);
         jj_consume_token(IDENTIFIER);
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-  {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_xsd_namespace:
         jj_consume_token(tok_xsd_namespace);
         jj_consume_token(tok_literal);
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-  {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_csharp_namespace:
         jj_consume_token(tok_csharp_namespace);
         jj_consume_token(IDENTIFIER);
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-  {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       default:
         jj_la1[4] = jj_gen;
@@ -360,76 +471,93 @@
         throw new ParseException();
       }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode Include() throws ParseException {
-                         /*@bgen(jjtree) Include */
- DynamicSerDeInclude jjtn000 = new DynamicSerDeInclude(JJTINCLUDE);
- boolean jjtc000 = true;
- jjtree.openNodeScope(jjtn000);String fname;
- boolean found = false;
+    /* @bgen(jjtree) Include */
+    DynamicSerDeInclude jjtn000 = new DynamicSerDeInclude(JJTINCLUDE);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
+    String fname;
+    boolean found = false;
     try {
       jj_consume_token(tok_include);
       fname = jj_consume_token(tok_literal).image;
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-    // bugbug somewhat fragile below substring expression
-    fname = fname.substring(1,fname.length() - 1);
-
-    // try to find the file on the include path
-    File f = thrift_grammar.findFile(fname, this.include_path);
-    if(f != null) {
+      jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+      // bugbug somewhat fragile below substring expression
+      fname = fname.substring(1, fname.length() - 1);
+
+      // try to find the file on the include path
+      File f = thrift_grammar.findFile(fname, include_path);
+      if (f != null) {
         found = true;
         try {
-            FileInputStream fis = new FileInputStream(f);
-            thrift_grammar t = new thrift_grammar(fis,this.include_path, false);
-            t.Start();
-            fis.close();
-            found = true;
-            // add in what we found to our type and table tables.
-            this.tables.putAll(t.tables);
-            this.types.putAll(t.types);
+          FileInputStream fis = new FileInputStream(f);
+          thrift_grammar t = new thrift_grammar(fis, include_path, false);
+          t.Start();
+          fis.close();
+          found = true;
+          // add in what we found to our type and table tables.
+          tables.putAll(t.tables);
+          types.putAll(t.types);
         } catch (Exception e) {
-            System.out.println("File: " + fname + " - Oops.");
-            System.out.println(e.getMessage());
-            e.printStackTrace();
+          System.out.println("File: " + fname + " - Oops.");
+          System.out.println(e.getMessage());
+          e.printStackTrace();
         }
-    }
-    if(!found) {
-        {if (true) throw new RuntimeException("include file not found: " + fname);}
-    }
-    {if (true) return jjtn000;}
+      }
+      if (!found) {
+        {
+          if (true) {
+            throw new RuntimeException("include file not found: " + fname);
+          }
+        }
+      }
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } finally {
-     if (jjtc000) {
-       jjtree.closeNodeScope(jjtn000, true);
-     }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode Definition() throws ParseException {
-                           /*@bgen(jjtree) Definition */
-  DynamicSerDeDefinition jjtn000 = new DynamicSerDeDefinition(JJTDEFINITION);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Definition */
+    DynamicSerDeDefinition jjtn000 = new DynamicSerDeDefinition(JJTDEFINITION);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case tok_const:
         Const();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_service:
         Service();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_senum:
       case tok_typedef:
@@ -437,9 +565,13 @@
       case tok_exception:
       case tok_enum:
         TypeDefinition();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       default:
         jj_la1[5] = jj_gen;
@@ -447,63 +579,96 @@
         throw new ParseException();
       }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode TypeDefinition() throws ParseException {
-                               /*@bgen(jjtree) TypeDefinition */
-  DynamicSerDeTypeDefinition jjtn000 = new DynamicSerDeTypeDefinition(JJTTYPEDEFINITION);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) TypeDefinition */
+    DynamicSerDeTypeDefinition jjtn000 = new DynamicSerDeTypeDefinition(
+        JJTTYPEDEFINITION);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case tok_typedef:
         Typedef();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-   {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_enum:
         Enum();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-   {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_senum:
         Senum();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-   {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_struct:
         Struct();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-   {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_exception:
         Xception();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-   {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       default:
         jj_la1[6] = jj_gen;
@@ -511,78 +676,107 @@
         throw new ParseException();
       }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public DynamicSerDeTypedef Typedef() throws ParseException {
-                                 /*@bgen(jjtree) Typedef */
-  DynamicSerDeTypedef jjtn000 = new DynamicSerDeTypedef(JJTTYPEDEF);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Typedef */
+    DynamicSerDeTypedef jjtn000 = new DynamicSerDeTypedef(JJTTYPEDEF);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       jj_consume_token(tok_typedef);
       DefinitionType();
       jjtn000.name = jj_consume_token(IDENTIFIER).image;
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-        // store the type for later retrieval
-        this.types.put(jjtn000.name, jjtn000);
-        {if (true) return jjtn000;}
+      // store the type for later retrieval
+      types.put(jjtn000.name, jjtn000);
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
-// returning void because we ignore this production.
+  // returning void because we ignore this production.
   final public void CommaOrSemicolon() throws ParseException {
-                           /*@bgen(jjtree) CommaOrSemicolon */
-  DynamicSerDeCommaOrSemicolon jjtn000 = new DynamicSerDeCommaOrSemicolon(JJTCOMMAORSEMICOLON);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) CommaOrSemicolon */
+    DynamicSerDeCommaOrSemicolon jjtn000 = new DynamicSerDeCommaOrSemicolon(
+        JJTCOMMAORSEMICOLON);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case 59:
         jj_consume_token(59);
         break;
       case 60:
         jj_consume_token(60);
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
 
         break;
       default:
@@ -591,17 +785,17 @@
         throw new ParseException();
       }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
   }
 
   final public SimpleNode Enum() throws ParseException {
-                     /*@bgen(jjtree) Enum */
-  DynamicSerDeEnum jjtn000 = new DynamicSerDeEnum(JJTENUM);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Enum */
+    DynamicSerDeEnum jjtn000 = new DynamicSerDeEnum(JJTENUM);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       jj_consume_token(tok_enum);
       jj_consume_token(IDENTIFIER);
@@ -610,39 +804,55 @@
       jj_consume_token(62);
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    {if (true) return jjtn000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode EnumDefList() throws ParseException {
-                            /*@bgen(jjtree) EnumDefList */
-  DynamicSerDeEnumDefList jjtn000 = new DynamicSerDeEnumDefList(JJTENUMDEFLIST);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) EnumDefList */
+    DynamicSerDeEnumDefList jjtn000 = new DynamicSerDeEnumDefList(
+        JJTENUMDEFLIST);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      label_3:
-      while (true) {
+      label_3: while (true) {
         EnumDef();
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
         case IDENTIFIER:
           ;
           break;
@@ -653,37 +863,53 @@
       }
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    {if (true) return jjtn000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode EnumDef() throws ParseException {
-                        /*@bgen(jjtree) EnumDef */
-  DynamicSerDeEnumDef jjtn000 = new DynamicSerDeEnumDef(JJTENUMDEF);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) EnumDef */
+    DynamicSerDeEnumDef jjtn000 = new DynamicSerDeEnumDef(JJTENUMDEF);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       jj_consume_token(IDENTIFIER);
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case 63:
         jj_consume_token(63);
         jj_consume_token(tok_int_constant);
@@ -692,7 +918,7 @@
         jj_la1[9] = jj_gen;
         ;
       }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case 59:
       case 60:
         CommaOrSemicolon();
@@ -701,36 +927,52 @@
         jj_la1[10] = jj_gen;
         ;
       }
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
-    } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
+    } catch (Throwable jjte000) {
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode Senum() throws ParseException {
-                      /*@bgen(jjtree) Senum */
-  DynamicSerDeSenum jjtn000 = new DynamicSerDeSenum(JJTSENUM);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Senum */
+    DynamicSerDeSenum jjtn000 = new DynamicSerDeSenum(JJTSENUM);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       jj_consume_token(tok_senum);
       jj_consume_token(IDENTIFIER);
@@ -739,39 +981,55 @@
       jj_consume_token(62);
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    {if (true) return jjtn000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode SenumDefList() throws ParseException {
-                             /*@bgen(jjtree) SenumDefList */
-  DynamicSerDeSenumDefList jjtn000 = new DynamicSerDeSenumDefList(JJTSENUMDEFLIST);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) SenumDefList */
+    DynamicSerDeSenumDefList jjtn000 = new DynamicSerDeSenumDefList(
+        JJTSENUMDEFLIST);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      label_4:
-      while (true) {
+      label_4: while (true) {
         SenumDef();
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
         case tok_literal:
           ;
           break;
@@ -782,37 +1040,53 @@
       }
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    {if (true) return jjtn000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode SenumDef() throws ParseException {
-                         /*@bgen(jjtree) SenumDef */
-  DynamicSerDeSenumDef jjtn000 = new DynamicSerDeSenumDef(JJTSENUMDEF);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) SenumDef */
+    DynamicSerDeSenumDef jjtn000 = new DynamicSerDeSenumDef(JJTSENUMDEF);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       jj_consume_token(tok_literal);
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case 59:
       case 60:
         CommaOrSemicolon();
@@ -823,41 +1097,57 @@
       }
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    {if (true) return jjtn000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode Const() throws ParseException {
-                      /*@bgen(jjtree) Const */
-  DynamicSerDeConst jjtn000 = new DynamicSerDeConst(JJTCONST);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Const */
+    DynamicSerDeConst jjtn000 = new DynamicSerDeConst(JJTCONST);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       jj_consume_token(tok_const);
       FieldType();
       jj_consume_token(IDENTIFIER);
       jj_consume_token(63);
       ConstValue();
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case 59:
       case 60:
         CommaOrSemicolon();
@@ -868,71 +1158,91 @@
       }
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    {if (true) return jjtn000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode ConstValue() throws ParseException {
-                           /*@bgen(jjtree) ConstValue */
-  DynamicSerDeConstValue jjtn000 = new DynamicSerDeConstValue(JJTCONSTVALUE);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) ConstValue */
+    DynamicSerDeConstValue jjtn000 = new DynamicSerDeConstValue(JJTCONSTVALUE);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case tok_int_constant:
         jj_consume_token(tok_int_constant);
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
 
         break;
       case tok_double_constant:
         jj_consume_token(tok_double_constant);
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
 
         break;
       case tok_literal:
         jj_consume_token(tok_literal);
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
 
         break;
       case IDENTIFIER:
         jj_consume_token(IDENTIFIER);
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
 
         break;
       case 64:
         ConstList();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
 
         break;
       case 61:
         ConstMap();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       default:
         jj_la1[14] = jj_gen;
@@ -940,71 +1250,99 @@
         throw new ParseException();
       }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode ConstList() throws ParseException {
-                          /*@bgen(jjtree) ConstList */
-  DynamicSerDeConstList jjtn000 = new DynamicSerDeConstList(JJTCONSTLIST);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) ConstList */
+    DynamicSerDeConstList jjtn000 = new DynamicSerDeConstList(JJTCONSTLIST);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       jj_consume_token(64);
       ConstListContents();
       jj_consume_token(65);
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    {if (true) return jjtn000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode ConstListContents() throws ParseException {
-                                  /*@bgen(jjtree) ConstListContents */
-  DynamicSerDeConstListContents jjtn000 = new DynamicSerDeConstListContents(JJTCONSTLISTCONTENTS);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) ConstListContents */
+    DynamicSerDeConstListContents jjtn000 = new DynamicSerDeConstListContents(
+        JJTCONSTLISTCONTENTS);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      label_5:
-      while (true) {
+      label_5: while (true) {
         ConstValue();
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
         case 59:
         case 60:
           CommaOrSemicolon();
@@ -1013,7 +1351,7 @@
           jj_la1[15] = jj_gen;
           ;
         }
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
         case tok_int_constant:
         case tok_double_constant:
         case IDENTIFIER:
@@ -1029,82 +1367,114 @@
       }
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    {if (true) return jjtn000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode ConstMap() throws ParseException {
-                         /*@bgen(jjtree) ConstMap */
-  DynamicSerDeConstMap jjtn000 = new DynamicSerDeConstMap(JJTCONSTMAP);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) ConstMap */
+    DynamicSerDeConstMap jjtn000 = new DynamicSerDeConstMap(JJTCONSTMAP);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       jj_consume_token(61);
       ConstMapContents();
       jj_consume_token(62);
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    {if (true) return jjtn000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode ConstMapContents() throws ParseException {
-                                 /*@bgen(jjtree) ConstMapContents */
-  DynamicSerDeConstMapContents jjtn000 = new DynamicSerDeConstMapContents(JJTCONSTMAPCONTENTS);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) ConstMapContents */
+    DynamicSerDeConstMapContents jjtn000 = new DynamicSerDeConstMapContents(
+        JJTCONSTMAPCONTENTS);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case tok_int_constant:
       case tok_double_constant:
       case IDENTIFIER:
       case tok_literal:
       case 61:
       case 64:
-        label_6:
-        while (true) {
+        label_6: while (true) {
           ConstValue();
           jj_consume_token(66);
           ConstValue();
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
           case 59:
           case 60:
             CommaOrSemicolon();
@@ -1113,7 +1483,7 @@
             jj_la1[17] = jj_gen;
             ;
           }
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
           case tok_int_constant:
           case tok_double_constant:
           case IDENTIFIER:
@@ -1127,43 +1497,59 @@
             break label_6;
           }
         }
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
 
         break;
       default:
         jj_la1[19] = jj_gen;
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
       }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public DynamicSerDeStruct Struct() throws ParseException {
-                                /*@bgen(jjtree) Struct */
-  DynamicSerDeStruct jjtn000 = new DynamicSerDeStruct(JJTSTRUCT);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Struct */
+    DynamicSerDeStruct jjtn000 = new DynamicSerDeStruct(JJTSTRUCT);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       jj_consume_token(tok_struct);
       jjtn000.name = jj_consume_token(IDENTIFIER).image;
@@ -1172,35 +1558,51 @@
       jj_consume_token(62);
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-   this.types.put(jjtn000.name,jjtn000);
-    {if (true) return jjtn000;}
+      types.put(jjtn000.name, jjtn000);
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode Xception() throws ParseException {
-                         /*@bgen(jjtree) Xception */
-  DynamicSerDeXception jjtn000 = new DynamicSerDeXception(JJTXCEPTION);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Xception */
+    DynamicSerDeXception jjtn000 = new DynamicSerDeXception(JJTXCEPTION);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       jj_consume_token(tok_exception);
       jj_consume_token(IDENTIFIER);
@@ -1209,44 +1611,59 @@
       jj_consume_token(62);
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    {if (true) return jjtn000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode Service() throws ParseException {
-                        /*@bgen(jjtree) Service */
-  DynamicSerDeService jjtn000 = new DynamicSerDeService(JJTSERVICE);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Service */
+    DynamicSerDeService jjtn000 = new DynamicSerDeService(JJTSERVICE);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       jj_consume_token(tok_service);
       jj_consume_token(IDENTIFIER);
       Extends();
       jj_consume_token(61);
       FlagArgs();
-      label_7:
-      while (true) {
+      label_7: while (true) {
         Function();
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
         case tok_void:
         case tok_bool:
         case tok_i16:
@@ -1270,39 +1687,59 @@
       jj_consume_token(62);
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-        // at some point, these should be inserted as a "db"
-        {if (true) return jjtn000;}
+      // at some point, these should be inserted as a "db"
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode FlagArgs() throws ParseException {
-                         /*@bgen(jjtree) FlagArgs */
-  DynamicSerDeFlagArgs jjtn000 = new DynamicSerDeFlagArgs(JJTFLAGARGS);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) FlagArgs */
+    DynamicSerDeFlagArgs jjtn000 = new DynamicSerDeFlagArgs(JJTFLAGARGS);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    {if (true) return jjtn000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } finally {
       if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
@@ -1312,14 +1749,18 @@
   }
 
   final public SimpleNode UnflagArgs() throws ParseException {
-                           /*@bgen(jjtree) UnflagArgs */
-  DynamicSerDeUnflagArgs jjtn000 = new DynamicSerDeUnflagArgs(JJTUNFLAGARGS);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) UnflagArgs */
+    DynamicSerDeUnflagArgs jjtn000 = new DynamicSerDeUnflagArgs(JJTUNFLAGARGS);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    {if (true) return jjtn000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } finally {
       if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
@@ -1329,48 +1770,56 @@
   }
 
   final public SimpleNode Extends() throws ParseException {
-                        /*@bgen(jjtree) Extends */
-  DynamicSerDeExtends jjtn000 = new DynamicSerDeExtends(JJTEXTENDS);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Extends */
+    DynamicSerDeExtends jjtn000 = new DynamicSerDeExtends(JJTEXTENDS);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case tok_extends:
         jj_consume_token(tok_extends);
         jj_consume_token(IDENTIFIER);
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       default:
         jj_la1[21] = jj_gen;
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
       }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public DynamicSerDeFunction Function() throws ParseException {
-                                   /*@bgen(jjtree) Function */
-  DynamicSerDeFunction jjtn000 = new DynamicSerDeFunction(JJTFUNCTION);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Function */
+    DynamicSerDeFunction jjtn000 = new DynamicSerDeFunction(JJTFUNCTION);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
       Async();
       FunctionType();
       // the name of the function/table
-        jjtn000.name = jj_consume_token(IDENTIFIER).image;
+      jjtn000.name = jj_consume_token(IDENTIFIER).image;
       jj_consume_token(67);
       FieldList();
       jj_consume_token(68);
       Throws();
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case 59:
       case 60:
         CommaOrSemicolon();
@@ -1381,60 +1830,76 @@
       }
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-        this.tables.put(jjtn000.name, jjtn000);
-        {if (true) return jjtn000;}
+      tables.put(jjtn000.name, jjtn000);
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public void Async() throws ParseException {
-                /*@bgen(jjtree) Async */
-  DynamicSerDeAsync jjtn000 = new DynamicSerDeAsync(JJTASYNC);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Async */
+    DynamicSerDeAsync jjtn000 = new DynamicSerDeAsync(JJTASYNC);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case tok_async:
         jj_consume_token(tok_async);
         break;
       default:
         jj_la1[23] = jj_gen;
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
 
       }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
   }
 
   final public void Throws() throws ParseException {
-                 /*@bgen(jjtree) Throws */
-  DynamicSerDeThrows jjtn000 = new DynamicSerDeThrows(JJTTHROWS);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) Throws */
+    DynamicSerDeThrows jjtn000 = new DynamicSerDeThrows(JJTTHROWS);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case tok_throws:
         jj_consume_token(tok_throws);
         jj_consume_token(67);
@@ -1443,41 +1908,54 @@
         break;
       default:
         jj_la1[24] = jj_gen;
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
 
       }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
   }
 
-// nothing special - just use the DynamicSerDeFieldList's children methods to access the fields
+  // nothing special - just use the DynamicSerDeFieldList's children methods to
+  // access the fields
   final public DynamicSerDeFieldList FieldList() throws ParseException {
-                                     /*@bgen(jjtree) FieldList */
-   DynamicSerDeFieldList jjtn000 = new DynamicSerDeFieldList(JJTFIELDLIST);
-   boolean jjtc000 = true;
-   jjtree.openNodeScope(jjtn000);this.field_val = -1;
-    try {
-      label_8:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    /* @bgen(jjtree) FieldList */
+    DynamicSerDeFieldList jjtn000 = new DynamicSerDeFieldList(JJTFIELDLIST);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
+    field_val = -1;
+    try {
+      label_8: while (true) {
+        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
         case tok_bool:
         case tok_i16:
         case tok_i32:
@@ -1500,39 +1978,55 @@
         }
         Field();
       }
-                  jjtree.closeNodeScope(jjtn000, true);
-                  jjtc000 = false;
-    {if (true) return jjtn000;}
-    } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
+      jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
+    } catch (Throwable jjte000) {
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public DynamicSerDeField Field() throws ParseException {
-                             /*@bgen(jjtree) Field */
- DynamicSerDeField jjtn000 = new DynamicSerDeField(JJTFIELD);
- boolean jjtc000 = true;
- jjtree.openNodeScope(jjtn000);String fidnum = "";
- String fid;
+    /* @bgen(jjtree) Field */
+    DynamicSerDeField jjtn000 = new DynamicSerDeField(JJTFIELD);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
+    String fidnum = "";
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case tok_int_constant:
         fidnum = jj_consume_token(tok_int_constant).image;
         jj_consume_token(66);
@@ -1544,9 +2038,9 @@
       FieldRequiredness();
       FieldType();
       // the name of the field - not optional
-        jjtn000.name = jj_consume_token(IDENTIFIER).image;
+      jjtn000.name = jj_consume_token(IDENTIFIER).image;
       FieldValue();
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case 59:
       case 60:
         CommaOrSemicolon();
@@ -1557,214 +2051,318 @@
       }
       jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
-    if(fidnum.length() > 0) {
-       int fidInt = Integer.valueOf(fidnum);
-       jjtn000.fieldid = fidInt;
-    } else {
-       jjtn000.fieldid = this.field_val--;
-    }
-    {if (true) return jjtn000;}
+      if (fidnum.length() > 0) {
+        int fidInt = Integer.valueOf(fidnum);
+        jjtn000.fieldid = fidInt;
+      } else {
+        jjtn000.fieldid = field_val--;
+      }
+      {
+        if (true) {
+          return jjtn000;
+        }
+      }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
-  final public DynamicSerDeFieldRequiredness FieldRequiredness() throws ParseException {
-                                                     /*@bgen(jjtree) FieldRequiredness */
-  DynamicSerDeFieldRequiredness jjtn000 = new DynamicSerDeFieldRequiredness(JJTFIELDREQUIREDNESS);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+  final public DynamicSerDeFieldRequiredness FieldRequiredness()
+      throws ParseException {
+    /* @bgen(jjtree) FieldRequiredness */
+    DynamicSerDeFieldRequiredness jjtn000 = new DynamicSerDeFieldRequiredness(
+        JJTFIELDREQUIREDNESS);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case tok_required:
         jj_consume_token(tok_required);
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-      jjtn000.requiredness = DynamicSerDeFieldRequiredness.RequirednessTypes.Required;
-      {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        jjtn000.requiredness = DynamicSerDeFieldRequiredness.RequirednessTypes.Required;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_optional:
         jj_consume_token(tok_optional);
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-      jjtn000.requiredness = DynamicSerDeFieldRequiredness.RequirednessTypes.Optional;
-        {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        jjtn000.requiredness = DynamicSerDeFieldRequiredness.RequirednessTypes.Optional;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_skip:
         jj_consume_token(tok_skip);
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-      jjtn000.requiredness = DynamicSerDeFieldRequiredness.RequirednessTypes.Skippable;
-        {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        jjtn000.requiredness = DynamicSerDeFieldRequiredness.RequirednessTypes.Skippable;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       default:
         jj_la1[28] = jj_gen;
-     jjtree.closeNodeScope(jjtn000, true);
-     jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
       }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode FieldValue() throws ParseException {
-                           /*@bgen(jjtree) FieldValue */
-  DynamicSerDeFieldValue jjtn000 = new DynamicSerDeFieldValue(JJTFIELDVALUE);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) FieldValue */
+    DynamicSerDeFieldValue jjtn000 = new DynamicSerDeFieldValue(JJTFIELDVALUE);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case 63:
         jj_consume_token(63);
         ConstValue();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-        {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       default:
         jj_la1[29] = jj_gen;
-  jjtree.closeNodeScope(jjtn000, true);
-  jjtc000 = false;
-        {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
       }
     } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {
-      jjtree.closeNodeScope(jjtn000, true);
-    }
+      if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
     throw new Error("Missing return statement in function");
   }
 
   final public SimpleNode DefinitionType() throws ParseException {
-                               /*@bgen(jjtree) DefinitionType */
-  DynamicSerDeDefinitionType jjtn000 = new DynamicSerDeDefinitionType(JJTDEFINITIONTYPE);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
+    /* @bgen(jjtree) DefinitionType */
+    DynamicSerDeDefinitionType jjtn000 = new DynamicSerDeDefinitionType(
+        JJTDEFINITIONTYPE);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);
     try {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
       case tok_string:
         TypeString();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_bool:
         TypeBool();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_i16:
         Typei16();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_i32:
         Typei32();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_i64:
         Typei64();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_double:
         TypeDouble();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_map:
         TypeMap();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_set:
         TypeSet();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       case tok_list:
         TypeList();
-      jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-    {if (true) return jjtn000;}
+        jjtree.closeNodeScope(jjtn000, true);
+        jjtc000 = false;
+        {
+          if (true) {
+            return jjtn000;
+          }
+        }
         break;
       default:
         jj_la1[30] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-    } catch (Throwable jjte000) {
-    if (jjtc000) {
-      jjtree.clearNodeScope(jjtn000);
-      jjtc000 = false;
-    } else {
-      jjtree.popNode();
-    }
-    if (jjte000 instanceof RuntimeException) {
-      {if (true) throw (RuntimeException)jjte000;}
-    }
-    if (jjte000 instanceof ParseException) {
-      {if (true) throw (ParseException)jjte000;}
-    }
-    {if (true) throw (Error)jjte000;}
+    } catch (Throwable jjte000) {
+      if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {
+          if (true) {
+            throw (RuntimeException) jjte000;
+          }
+        }
+      }
+      if (jjte000 instanceof ParseException) {
+        {
+          if (true) {
+            throw (ParseException) jjte000;
+          }
+        }
+      }
+      {
+        if (true) {
+          throw (Error) jjte000;
+        }
+      }
     } finally {
-    if (jjtc000) {

[... 975 lines stripped ...]