Revert to use of javacc-6.1.3 due to regression

1 files changed, 192 insertions, 192 deletions

diff --git a/vhdlparser/VhdlParserConstants.h b/vhdlparser/VhdlParserConstants.h
index fe51270..882402b 100644
--- a/vhdlparser/VhdlParserConstants.h
+++ b/vhdlparser/VhdlParserConstants.h
@@ -2,7 +2,7 @@
 
 /**
  * Token literal values and constants.
- * Generated by org.javacc.parser.OtherFilesGenCPP#start()
+ * Generated by org.javacc.parser.OtherFilesGen#start()
  */
 #ifndef VHDLPARSERCONSTANTS_H
 #define VHDLPARSERCONSTANTS_H
@@ -387,387 +387,387 @@ const  int VHDL2008TOOLDIR = 189;
 const  int DEFAULT = 0;
 
   /** Literal token values. */
-  static const JJChar tokenImage_arr_0[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_0[] = 
 {0x3c, 0x45, 0x4f, 0x46, 0x3e, 0};
-  static const JJChar tokenImage_arr_1[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_1[] = 
 {0x22, 0x20, 0x22, 0};
-  static const JJChar tokenImage_arr_2[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_2[] = 
 {0x22, 0x9, 0x22, 0};
-  static const JJChar tokenImage_arr_3[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_3[] = 
 {0x22, 0xa, 0x22, 0};
-  static const JJChar tokenImage_arr_4[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_4[] = 
 {0x22, 0xd, 0x22, 0};
-  static const JJChar tokenImage_arr_5[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_5[] = 
 {0x22, 0x3c, 0x44, 0x4f, 0x58, 0x59, 0x47, 0x45, 0x4e, 0x5f, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_6[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_6[] = 
 {0x22, 0x3c, 0x4d, 0x55, 0x4c, 0x54, 0x5f, 0x44, 0x4f, 0x58, 0x59, 0x47, 0x45, 0x4e, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_7[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_7[] = 
 {0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x46, 0x4c, 0x4f, 0x57, 0x43, 0x48, 0x41, 0x52, 0x54, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_8[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_8[] = 
 {0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_9[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_9[] = 
 {0x22, 0x3c, 0x4d, 0x55, 0x4c, 0x54, 0x5f, 0x44, 0x4f, 0x58, 0x59, 0x47, 0x45, 0x4e, 0x5f, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x32, 0x30, 0x30, 0x38, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_10[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_10[] = 
 {0x22, 0x3c, 0x4d, 0x55, 0x4c, 0x54, 0x5f, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x32, 0x30, 0x30, 0x38, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_11[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_11[] = 
 {0x22, 0x61, 0x62, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_12[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_12[] = 
 {0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_13[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_13[] = 
 {0x22, 0x61, 0x66, 0x74, 0x65, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_14[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_14[] = 
 {0x22, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_15[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_15[] = 
 {0x22, 0x61, 0x6c, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_16[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_16[] = 
 {0x22, 0x61, 0x6e, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_17[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_17[] = 
 {0x22, 0x61, 0x72, 0x63, 0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_18[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_18[] = 
 {0x22, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0};
-  static const JJChar tokenImage_arr_19[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_19[] = 
 {0x22, 0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_20[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_20[] = 
 {0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_21[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_21[] = 
 {0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_22[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_22[] = 
 {0x22, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_23[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_23[] = 
 {0x22, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_24[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_24[] = 
 {0x22, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0};
-  static const JJChar tokenImage_arr_25[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_25[] = 
 {0x22, 0x62, 0x6f, 0x64, 0x79, 0x22, 0};
-  static const JJChar tokenImage_arr_26[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_26[] = 
 {0x22, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_27[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_27[] = 
 {0x22, 0x62, 0x75, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_28[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_28[] = 
 {0x22, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_29[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_29[] = 
 {0x22, 0x63, 0x61, 0x73, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_30[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_30[] = 
 {0x22, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_31[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_31[] = 
 {0x22, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_32[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_32[] = 
 {0x22, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_33[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_33[] = 
 {0x22, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_34[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_34[] = 
 {0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_35[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_35[] = 
 {0x22, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_36[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_36[] = 
 {0x22, 0x64, 0x6f, 0x77, 0x6e, 0x74, 0x6f, 0x22, 0};
-  static const JJChar tokenImage_arr_37[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_37[] = 
 {0x22, 0x65, 0x6c, 0x73, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_38[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_38[] = 
 {0x22, 0x65, 0x6c, 0x73, 0x69, 0x66, 0x22, 0};
-  static const JJChar tokenImage_arr_39[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_39[] = 
 {0x22, 0x65, 0x6e, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_40[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_40[] = 
 {0x22, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0};
-  static const JJChar tokenImage_arr_41[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_41[] = 
 {0x22, 0x65, 0x78, 0x69, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_42[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_42[] = 
 {0x22, 0x66, 0x61, 0x69, 0x72, 0x6e, 0x65, 0x73, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_43[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_43[] = 
 {0x22, 0x66, 0x69, 0x6c, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_44[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_44[] = 
 {0x22, 0x66, 0x6f, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_45[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_45[] = 
 {0x22, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_46[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_46[] = 
 {0x22, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_47[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_47[] = 
 {0x22, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_48[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_48[] = 
 {0x22, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x22, 0};
-  static const JJChar tokenImage_arr_49[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_49[] = 
 {0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0};
-  static const JJChar tokenImage_arr_50[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_50[] = 
 {0x22, 0x67, 0x75, 0x61, 0x72, 0x64, 0x65, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_51[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_51[] = 
 {0x22, 0x69, 0x66, 0x22, 0};
-  static const JJChar tokenImage_arr_52[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_52[] = 
 {0x22, 0x69, 0x6d, 0x70, 0x75, 0x72, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_53[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_53[] = 
 {0x22, 0x69, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_54[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_54[] = 
 {0x22, 0x69, 0x6e, 0x65, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_55[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_55[] = 
 {0x22, 0x69, 0x6e, 0x6f, 0x75, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_56[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_56[] = 
 {0x22, 0x69, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_57[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_57[] = 
 {0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_58[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_58[] = 
 {0x22, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x22, 0};
-  static const JJChar tokenImage_arr_59[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_59[] = 
 {0x22, 0x6c, 0x69, 0x6e, 0x6b, 0x61, 0x67, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_60[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_60[] = 
 {0x22, 0x6c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_61[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_61[] = 
 {0x22, 0x6c, 0x6f, 0x6f, 0x70, 0x22, 0};
-  static const JJChar tokenImage_arr_62[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_62[] = 
 {0x22, 0x6d, 0x61, 0x70, 0x22, 0};
-  static const JJChar tokenImage_arr_63[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_63[] = 
 {0x22, 0x6d, 0x6f, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_64[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_64[] = 
 {0x22, 0x6e, 0x61, 0x6e, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_65[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_65[] = 
 {0x22, 0x6e, 0x65, 0x77, 0x22, 0};
-  static const JJChar tokenImage_arr_66[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_66[] = 
 {0x22, 0x6e, 0x65, 0x78, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_67[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_67[] = 
 {0x22, 0x6e, 0x6f, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_68[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_68[] = 
 {0x22, 0x6e, 0x6f, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_69[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_69[] = 
 {0x22, 0x6e, 0x75, 0x6c, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_70[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_70[] = 
 {0x22, 0x6f, 0x66, 0x22, 0};
-  static const JJChar tokenImage_arr_71[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_71[] = 
 {0x22, 0x6f, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_72[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_72[] = 
 {0x22, 0x6f, 0x70, 0x65, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_73[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_73[] = 
 {0x22, 0x6f, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_74[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_74[] = 
 {0x22, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_75[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_75[] = 
 {0x22, 0x6f, 0x75, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_76[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_76[] = 
 {0x22, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_77[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_77[] = 
 {0x22, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_78[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_78[] = 
 {0x22, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_79[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_79[] = 
 {0x22, 0x70, 0x6f, 0x73, 0x74, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_80[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_80[] = 
 {0x22, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_81[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_81[] = 
 {0x22, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_82[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_82[] = 
 {0x22, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x22, 0};
-  static const JJChar tokenImage_arr_83[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_83[] = 
 {0x22, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_84[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_84[] = 
 {0x22, 0x70, 0x75, 0x72, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_85[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_85[] = 
 {0x22, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_86[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_86[] = 
 {0x22, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_87[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_87[] = 
 {0x22, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_88[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_88[] = 
 {0x22, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_89[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_89[] = 
 {0x22, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_90[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_90[] = 
 {0x22, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_91[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_91[] = 
 {0x22, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_92[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_92[] = 
 {0x22, 0x72, 0x65, 0x6d, 0x22, 0};
-  static const JJChar tokenImage_arr_93[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_93[] = 
 {0x22, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_94[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_94[] = 
 {0x22, 0x72, 0x6f, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_95[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_95[] = 
 {0x22, 0x72, 0x6f, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_96[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_96[] = 
 {0x22, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_97[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_97[] = 
 {0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_98[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_98[] = 
 {0x22, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_99[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_99[] = 
 {0x22, 0x73, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x22, 0};
-  static const JJChar tokenImage_arr_100[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_100[] = 
 {0x22, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_101[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_101[] = 
 {0x22, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_102[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_102[] = 
 {0x22, 0x73, 0x6c, 0x61, 0x22, 0};
-  static const JJChar tokenImage_arr_103[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_103[] = 
 {0x22, 0x73, 0x6c, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_104[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_104[] = 
 {0x22, 0x73, 0x72, 0x61, 0x22, 0};
-  static const JJChar tokenImage_arr_105[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_105[] = 
 {0x22, 0x73, 0x72, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_106[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_106[] = 
 {0x22, 0x73, 0x74, 0x72, 0x6f, 0x6e, 0x67, 0x22, 0};
-  static const JJChar tokenImage_arr_107[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_107[] = 
 {0x22, 0x73, 0x75, 0x62, 0x74, 0x79, 0x70, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_108[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_108[] = 
 {0x22, 0x74, 0x68, 0x65, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_109[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_109[] = 
 {0x22, 0x74, 0x6f, 0x22, 0};
-  static const JJChar tokenImage_arr_110[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_110[] = 
 {0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_111[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_111[] = 
 {0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_112[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_112[] = 
 {0x22, 0x75, 0x6e, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_113[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_113[] = 
 {0x22, 0x75, 0x6e, 0x69, 0x74, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_114[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_114[] = 
 {0x22, 0x75, 0x6e, 0x74, 0x69, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_115[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_115[] = 
 {0x22, 0x75, 0x73, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_116[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_116[] = 
 {0x22, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_117[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_117[] = 
 {0x22, 0x76, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_118[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_118[] = 
 {0x22, 0x76, 0x70, 0x72, 0x6f, 0x70, 0x22, 0};
-  static const JJChar tokenImage_arr_119[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_119[] = 
 {0x22, 0x76, 0x75, 0x6e, 0x69, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_120[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_120[] = 
 {0x22, 0x77, 0x61, 0x69, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_121[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_121[] = 
 {0x22, 0x77, 0x68, 0x65, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_122[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_122[] = 
 {0x22, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_123[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_123[] = 
 {0x22, 0x77, 0x69, 0x74, 0x68, 0x22, 0};
-  static const JJChar tokenImage_arr_124[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_124[] = 
 {0x22, 0x78, 0x6f, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_125[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_125[] = 
 {0x22, 0x78, 0x6e, 0x6f, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_126[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_126[] = 
 {0x22, 0x26, 0x22, 0};
-  static const JJChar tokenImage_arr_127[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_127[] = 
 {0x22, 0x27, 0x22, 0};
-  static const JJChar tokenImage_arr_128[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_128[] = 
 {0x22, 0x28, 0x22, 0};
-  static const JJChar tokenImage_arr_129[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_129[] = 
 {0x22, 0x29, 0x22, 0};
-  static const JJChar tokenImage_arr_130[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_130[] = 
 {0x22, 0x2a, 0x2a, 0x22, 0};
-  static const JJChar tokenImage_arr_131[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_131[] = 
 {0x22, 0x2a, 0x22, 0};
-  static const JJChar tokenImage_arr_132[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_132[] = 
 {0x22, 0x2b, 0x22, 0};
-  static const JJChar tokenImage_arr_133[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_133[] = 
 {0x22, 0x2d, 0x22, 0};
-  static const JJChar tokenImage_arr_134[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_134[] = 
 {0x22, 0x2c, 0x22, 0};
-  static const JJChar tokenImage_arr_135[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_135[] = 
 {0x22, 0x3a, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_136[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_136[] = 
 {0x22, 0x3a, 0x22, 0};
-  static const JJChar tokenImage_arr_137[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_137[] = 
 {0x22, 0x3b, 0x22, 0};
-  static const JJChar tokenImage_arr_138[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_138[] = 
 {0x22, 0x3c, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_139[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_139[] = 
 {0x22, 0x3e, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_140[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_140[] = 
 {0x22, 0x3c, 0x22, 0};
-  static const JJChar tokenImage_arr_141[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_141[] = 
 {0x22, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_142[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_142[] = 
 {0x22, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_143[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_143[] = 
 {0x22, 0x2f, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_144[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_144[] = 
 {0x22, 0x3d, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_145[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_145[] = 
 {0x22, 0x3c, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_146[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_146[] = 
 {0x22, 0x3c, 0x3c, 0x22, 0};
-  static const JJChar tokenImage_arr_147[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_147[] = 
 {0x22, 0x3e, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_148[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_148[] = 
 {0x22, 0x3f, 0x3f, 0x22, 0};
-  static const JJChar tokenImage_arr_149[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_149[] = 
 {0x22, 0x3f, 0x3e, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_150[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_150[] = 
 {0x22, 0x3f, 0x3c, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_151[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_151[] = 
 {0x22, 0x3f, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_152[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_152[] = 
 {0x22, 0x3f, 0x3c, 0x22, 0};
-  static const JJChar tokenImage_arr_153[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_153[] = 
 {0x22, 0x3f, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_154[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_154[] = 
 {0x22, 0x3f, 0x2f, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_155[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_155[] = 
 {0x22, 0x3f, 0x22, 0};
-  static const JJChar tokenImage_arr_156[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_156[] = 
 {0x22, 0x7c, 0x22, 0};
-  static const JJChar tokenImage_arr_157[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_157[] = 
 {0x22, 0x2e, 0x22, 0};
-  static const JJChar tokenImage_arr_158[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_158[] = 
 {0x22, 0x2f, 0x22, 0};
-  static const JJChar tokenImage_arr_159[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_159[] = 
 {0x22, 0x40, 0x22, 0};
-  static const JJChar tokenImage_arr_160[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_160[] = 
 {0x22, 0x5e, 0x22, 0};
-  static const JJChar tokenImage_arr_161[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_161[] = 
 {0x22, 0x5b, 0x22, 0};
-  static const JJChar tokenImage_arr_162[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_162[] = 
 {0x22, 0x5d, 0x22, 0};
-  static const JJChar tokenImage_arr_163[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_163[] = 
 {0x22, 0x7b, 0x22, 0};
-  static const JJChar tokenImage_arr_164[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_164[] = 
 {0x22, 0x7d, 0x22, 0};
-  static const JJChar tokenImage_arr_165[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_165[] = 
 {0x22, 0x3c, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_166[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_166[] = 
 {0x22, 0x3c, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_167[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_167[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x49, 0x43, 0x5f, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x49, 0x46, 0x49, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_168[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_168[] = 
 {0x22, 0x3c, 0x45, 0x58, 0x54, 0x45, 0x4e, 0x44, 0x45, 0x44, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_169[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_169[] = 
 {0x22, 0x3c, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_170[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_170[] = 
 {0x22, 0x3c, 0x44, 0x45, 0x43, 0x49, 0x4d, 0x41, 0x4c, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_171[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_171[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x44, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_172[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_172[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x44, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_173[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_173[] = 
 {0x22, 0x3c, 0x45, 0x58, 0x50, 0x4f, 0x4e, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_174[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_174[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x49, 0x43, 0x5f, 0x47, 0x52, 0x41, 0x50, 0x48, 0x49, 0x43, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_175[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_175[] = 
 {0x22, 0x3c, 0x47, 0x52, 0x41, 0x50, 0x48, 0x49, 0x43, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_176[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_176[] = 
 {0x22, 0x3c, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x5f, 0x4f, 0x52, 0x5f, 0x44, 0x49, 0x47, 0x49, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_177[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_177[] = 
 {0x22, 0x3c, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x5f, 0x4f, 0x52, 0x5f, 0x44, 0x49, 0x47, 0x49, 0x54, 0x5f, 0x4f, 0x52, 0x5f, 0x53, 0x54, 0x44, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_178[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_178[] = 
 {0x22, 0x3c, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_179[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_179[] = 
 {0x22, 0x3c, 0x55, 0x50, 0x50, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_180[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_180[] = 
 {0x22, 0x3c, 0x42, 0x49, 0x54, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_181[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_181[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_182[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_182[] = 
 {0x22, 0x3c, 0x53, 0x54, 0x44, 0x5f, 0x4c, 0x4f, 0x47, 0x49, 0x43, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_183[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_183[] = 
 {0x22, 0x3c, 0x44, 0x49, 0x47, 0x49, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_184[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_184[] = 
 {0x22, 0x3c, 0x53, 0x50, 0x45, 0x43, 0x49, 0x41, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_185[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_185[] = 
 {0x22, 0x3c, 0x4f, 0x54, 0x48, 0x45, 0x52, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x41, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_186[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_186[] = 
 {0x22, 0x3c, 0x53, 0x50, 0x41, 0x43, 0x45, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_187[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_187[] = 
 {0x22, 0x3c, 0x4c, 0x4f, 0x57, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_188[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_188[] = 
 {0x22, 0x3c, 0x51, 0x55, 0x4f, 0x54, 0x45, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_189[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_189[] = 
 {0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x32, 0x30, 0x30, 0x38, 0x54, 0x4f, 0x4f, 0x4c, 0x44, 0x49, 0x52, 0x3e, 0x22, 0};
-  static const JJChar* const tokenImage[] = {
+  static JAVACC_STRING_TYPE tokenImage[] = {
 tokenImage_arr_0, 
 tokenImage_arr_1, 
 tokenImage_arr_2,