Refactoring: move qcstring and remove qtools

25 files changed, 1675 insertions, 1782 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f4a904..251e18b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,7 +174,6 @@ add_subdirectory(liblodepng)
 add_subdirectory(libmscgen)
 add_subdirectory(libversion)
 add_subdirectory(libxml)
-add_subdirectory(qtools)
 add_subdirectory(vhdlparser)
 add_subdirectory(src)
 
diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
index 9213e22..a6fde42 100644
--- a/addon/doxyapp/CMakeLists.txt
+++ b/addon/doxyapp/CMakeLists.txt
@@ -4,7 +4,6 @@ include_directories(
 	${PROJECT_SOURCE_DIR}/src
 	${PROJECT_SOURCE_DIR}/libversion
 	${GENERATED_SRC}
-	${PROJECT_SOURCE_DIR}/qtools
 	${ICONV_INCLUDE_DIR}
 	${CLANG_INCLUDEDIR}
 )
@@ -36,7 +35,6 @@ endif()
 
 target_link_libraries(doxyapp
 doxymain
-qtools
 md5
 xml
 lodepng
diff --git a/addon/doxyapp/doxyapp.cpp b/addon/doxyapp/doxyapp.cpp
index 06c7af3..ec93ef7 100644
--- a/addon/doxyapp/doxyapp.cpp
+++ b/addon/doxyapp/doxyapp.cpp
@@ -26,8 +26,7 @@
  */
 
 #include <stdlib.h>
-#include <qfile.h>
-#include <qdir.h>
+#include "dir.h"
 #include "doxygen.h"
 #include "outputgen.h"
 #include "parserintf.h"
@@ -297,7 +296,7 @@ int main(int argc,char **argv)
   }
 
   // clean up after us
-  QDir().rmdir("/tmp/doxygen");
+  Dir().rmdir("/tmp/doxygen");
 
   while (1)
   {
diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
index 7a422a1..f439c29 100644
--- a/addon/doxyparse/CMakeLists.txt
+++ b/addon/doxyparse/CMakeLists.txt
@@ -4,7 +4,6 @@ include_directories(
 	${PROJECT_SOURCE_DIR}/src
 	${PROJECT_SOURCE_DIR}/libversion
 	${GENERATED_SRC}
-	${PROJECT_SOURCE_DIR}/qtools
 	${ICONV_INCLUDE_DIR}
 	${CLANG_INCLUDEDIR}
 )
@@ -24,7 +23,6 @@ endif()
 
 target_link_libraries(doxyparse
 doxymain
-qtools
 md5
 xml
 lodepng
diff --git a/addon/doxyparse/doxyparse.cpp b/addon/doxyparse/doxyparse.cpp
index 4059861..3090783 100644
--- a/addon/doxyparse/doxyparse.cpp
+++ b/addon/doxyparse/doxyparse.cpp
@@ -40,8 +40,7 @@
 #include <cstdlib>
 #include <sstream>
 #include <map>
-#include <qdir.h>
-#include <qcstring.h>
+#include "qcstring.h"
 #include "namespacedef.h"
 #include "portable.h"
 
@@ -521,12 +520,12 @@ int main(int argc,char **argv) {
     }
   }
 
-  QDir thisDir;
+  Dir thisDir;
   // remove temporary files
-  if (!Doxygen::filterDBFileName.isEmpty()) thisDir.remove(Doxygen::filterDBFileName);
+  if (!Doxygen::filterDBFileName.isEmpty()) thisDir.remove(Doxygen::filterDBFileName.str());
 
   // clean up after us
-  thisDir.rmdir(Config_getString(OUTPUT_DIRECTORY));
+  thisDir.rmdir(Config_getString(OUTPUT_DIRECTORY).str());
 
   startYamlDocument();
   listSymbols();
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 22ced1e..868cd04 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,6 @@
 # vim:ts=4:sw=4:expandtab:autoindent:
 
 include_directories(
-    ${PROJECT_SOURCE_DIR}/qtools
     ${PROJECT_SOURCE_DIR}/filesystem
     ${PROJECT_SOURCE_DIR}/libmd5
     ${PROJECT_SOURCE_DIR}/liblodepng
@@ -286,6 +285,7 @@ add_library(doxymain STATIC
     pagedef.cpp
     perlmodgen.cpp
     plantuml.cpp
+    qcstring.cpp
     qhp.cpp
     qhpxmlwriter.cpp
     reflist.cpp
@@ -352,7 +352,6 @@ endif()
 target_link_libraries(doxygen PRIVATE
     doxymain
     doxycfg
-    qtools
     md5
     lodepng
     mscgen
@@ -372,7 +371,6 @@ set_project_warnings(doxycfg)
 set_project_warnings(doxymain)
 set_project_warnings(doxygen)
 
-set_project_coverage(qtools)
 set_project_coverage(doxycfg)
 set_project_coverage(doxymain)
 set_project_coverage(doxygen)
diff --git a/src/commentscan.l b/src/commentscan.l
index 89b8052..8fa2199 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -38,7 +38,6 @@
 #include <ctype.h>
 
 #include <qcstring.h>
-#include <qcstringlist.h>
 
 #include "cite.h"
 #include "commentscan.h"
@@ -60,89 +59,89 @@
 #define USE_STATE2STRING 0
 
 // forward declarations
-static bool handleBrief(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleFn(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleDef(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleOverload(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleEnum(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleDefGroup(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleAddToGroup(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleWeakGroup(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleNamespace(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handlePackage(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleClass(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleHeaderFile(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleProtocol(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleCategory(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleUnion(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleStruct(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleInterface(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleIdlException(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handlePage(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleMainpage(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleFile(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleDir(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleExample(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleDetails(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleNoop(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleName(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleTodo(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleTest(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleBug(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleSubpage(yyscan_t yyscanner,const QCString &s, const QCStringList &);
-static bool handleDeprecated(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleXRefItem(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleRelated(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleRelatedAlso(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleMemberOf(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleRefItem(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleSection(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleAnchor(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleCite(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleFormatBlock(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleAddIndex(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleIf(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleIfNot(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleElseIf(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleElse(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleEndIf(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleIngroup(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleNoSubGrouping(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleShowInitializer(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleHideInitializer(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleCallgraph(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleHideCallgraph(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleCallergraph(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleHideCallergraph(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleReferencedByRelation(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleHideReferencedByRelation(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleReferencesRelation(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleHideReferencesRelation(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleInternal(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleStatic(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handlePure(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handlePrivate(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handlePrivateSection(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleProtected(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleProtectedSection(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handlePublic(yyscan_t yyscanner,const QCString &s, const QCStringList &);
-static bool handlePublicSection(yyscan_t yyscanner,const QCString &s, const QCStringList &);
-static bool handleToc(yyscan_t yyscanner,const QCString &s, const QCStringList &);
-static bool handleInherit(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleExtends(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleCopyDoc(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleCopyBrief(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleCopyDetails(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleParBlock(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleEndParBlock(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleParam(yyscan_t yyscanner,const QCString &, const QCStringList &);
-static bool handleRetval(yyscan_t yyscanner,const QCString &, const QCStringList &);
+static bool handleBrief(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleFn(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleDef(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleOverload(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleEnum(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleDefGroup(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleAddToGroup(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleWeakGroup(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleNamespace(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handlePackage(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleClass(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleHeaderFile(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleProtocol(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleCategory(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleUnion(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleStruct(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleInterface(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleIdlException(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handlePage(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleMainpage(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleFile(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleDir(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleExample(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleDetails(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleNoop(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleName(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleTodo(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleTest(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleBug(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleSubpage(yyscan_t yyscanner,const QCString &s, const StringVector &);
+static bool handleDeprecated(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleXRefItem(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleRelated(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleRelatedAlso(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleMemberOf(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleRefItem(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleSection(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleAnchor(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleCite(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleFormatBlock(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleAddIndex(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleIf(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleIfNot(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleElseIf(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleElse(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleEndIf(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleIngroup(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleNoSubGrouping(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleShowInitializer(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleHideInitializer(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleCallgraph(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleHideCallgraph(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleCallergraph(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleHideCallergraph(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleReferencedByRelation(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleHideReferencedByRelation(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleReferencesRelation(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleHideReferencesRelation(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleInternal(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleStatic(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handlePure(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handlePrivate(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handlePrivateSection(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleProtected(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleProtectedSection(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handlePublic(yyscan_t yyscanner,const QCString &s, const StringVector &);
+static bool handlePublicSection(yyscan_t yyscanner,const QCString &s, const StringVector &);
+static bool handleToc(yyscan_t yyscanner,const QCString &s, const StringVector &);
+static bool handleInherit(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleExtends(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleCopyDoc(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleCopyBrief(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleCopyDetails(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleParBlock(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleEndParBlock(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleParam(yyscan_t yyscanner,const QCString &, const StringVector &);
+static bool handleRetval(yyscan_t yyscanner,const QCString &, const StringVector &);
 
 #if USE_STATE2STRING
 static const char *stateToString(int state);
 #endif
 
-typedef bool (*DocCmdFunc)(yyscan_t yyscanner,const QCString &name, const QCStringList &optList);
+typedef bool (*DocCmdFunc)(yyscan_t yyscanner,const QCString &name, const StringVector &optList);
 
 enum class CommandSpacing
 {
@@ -668,7 +667,7 @@ STopt  [^\n@\\]*
                                           if ((idx > 1) && (yytext[idx-1] == 'f') && (yytext[idx-2] == '\\' || yytext[idx-2] =='@')) REJECT;
                                           int idxEnd = fullMatch.find("}",idx+1);
                                           QCString cmdName;
-                                          QCStringList optList;
+                                          StringVector optList;
                                           if (idx == -1) // no options
                                           {
                                             cmdName = QCString(yytext).stripWhiteSpace().data()+1; // to remove {CMD}
@@ -677,7 +676,7 @@ STopt  [^\n@\\]*
                                           {
                                             cmdName = fullMatch.left(idx).stripWhiteSpace().data()+1; // to remove {CMD}
                                             QCString optStr = fullMatch.mid(idx+1,idxEnd-idx-1).stripWhiteSpace();
-                                            optList = QCStringList::split(',',optStr);
+                                            optList = split(optStr.str(),",");
                                           }
                                           auto it = docCmdMap.find(cmdName.data());
                                           //printf("lookup command '%s' found=%d\n",cmdName.data(),it!=docCmdMap.end());
@@ -1902,14 +1901,14 @@ STopt  [^\n@\\]*
 
 //----------------------------------------------------------------------------
 
-static bool handleBrief(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleBrief(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   //printf("handleBrief\n");
   setOutput(yyscanner,OutputBrief);
   return FALSE;
 }
 
-static bool handleFn(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleFn(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::MEMBERDOC_SEC);
@@ -1919,7 +1918,7 @@ static bool handleFn(yyscan_t yyscanner,const QCString &, const QCStringList &)
   return stop;
 }
 
-static bool handleDef(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleDef(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::DEFINEDOC_SEC);
@@ -1928,7 +1927,7 @@ static bool handleDef(yyscan_t yyscanner,const QCString &, const QCStringList &)
   return stop;
 }
 
-static bool handleOverload(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleOverload(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->functionProto.resize(0);
@@ -1936,7 +1935,7 @@ static bool handleOverload(yyscan_t yyscanner,const QCString &, const QCStringLi
   return FALSE;
 }
 
-static bool handleEnum(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleEnum(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::ENUMDOC_SEC);
@@ -1944,7 +1943,7 @@ static bool handleEnum(yyscan_t yyscanner,const QCString &, const QCStringList &
   return stop;
 }
 
-static bool handleDefGroup(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleDefGroup(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::GROUPDOC_SEC);
@@ -1953,7 +1952,7 @@ static bool handleDefGroup(yyscan_t yyscanner,const QCString &, const QCStringLi
   return stop;
 }
 
-static bool handleAddToGroup(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleAddToGroup(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::GROUPDOC_SEC);
@@ -1962,7 +1961,7 @@ static bool handleAddToGroup(yyscan_t yyscanner,const QCString &, const QCString
   return stop;
 }
 
-static bool handleWeakGroup(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleWeakGroup(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::GROUPDOC_SEC);
@@ -1971,7 +1970,7 @@ static bool handleWeakGroup(yyscan_t yyscanner,const QCString &, const QCStringL
   return stop;
 }
 
-static bool handleNamespace(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleNamespace(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::NAMESPACEDOC_SEC);
@@ -1979,7 +1978,7 @@ static bool handleNamespace(yyscan_t yyscanner,const QCString &, const QCStringL
   return stop;
 }
 
-static bool handlePackage(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handlePackage(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::PACKAGEDOC_SEC);
@@ -1987,7 +1986,7 @@ static bool handlePackage(yyscan_t yyscanner,const QCString &, const QCStringLis
   return stop;
 }
 
-static bool handleClass(yyscan_t yyscanner,const QCString &cmd, const QCStringList &)
+static bool handleClass(yyscan_t yyscanner,const QCString &cmd, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::CLASSDOC_SEC);
@@ -1996,14 +1995,14 @@ static bool handleClass(yyscan_t yyscanner,const QCString &cmd, const QCStringLi
   return stop;
 }
 
-static bool handleHeaderFile(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleHeaderFile(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   BEGIN( ClassDocArg2 );
   return FALSE;
 }
 
-static bool handleProtocol(yyscan_t yyscanner,const QCString &cmd, const QCStringList &)
+static bool handleProtocol(yyscan_t yyscanner,const QCString &cmd, const StringVector &)
 { // Obj-C protocol
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::PROTOCOLDOC_SEC);
@@ -2012,7 +2011,7 @@ static bool handleProtocol(yyscan_t yyscanner,const QCString &cmd, const QCStrin
   return stop;
 }
 
-static bool handleCategory(yyscan_t yyscanner,const QCString &cmd, const QCStringList &)
+static bool handleCategory(yyscan_t yyscanner,const QCString &cmd, const StringVector &)
 { // Obj-C category
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::CATEGORYDOC_SEC);
@@ -2021,7 +2020,7 @@ static bool handleCategory(yyscan_t yyscanner,const QCString &cmd, const QCStrin
   return stop;
 }
 
-static bool handleUnion(yyscan_t yyscanner,const QCString &cmd, const QCStringList &)
+static bool handleUnion(yyscan_t yyscanner,const QCString &cmd, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::UNIONDOC_SEC);
@@ -2030,7 +2029,7 @@ static bool handleUnion(yyscan_t yyscanner,const QCString &cmd, const QCStringLi
   return stop;
 }
 
-static bool handleStruct(yyscan_t yyscanner,const QCString &cmd, const QCStringList &)
+static bool handleStruct(yyscan_t yyscanner,const QCString &cmd, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::STRUCTDOC_SEC);
@@ -2039,7 +2038,7 @@ static bool handleStruct(yyscan_t yyscanner,const QCString &cmd, const QCStringL
   return stop;
 }
 
-static bool handleInterface(yyscan_t yyscanner,const QCString &cmd, const QCStringList &)
+static bool handleInterface(yyscan_t yyscanner,const QCString &cmd, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::INTERFACEDOC_SEC);
@@ -2048,7 +2047,7 @@ static bool handleInterface(yyscan_t yyscanner,const QCString &cmd, const QCStri
   return stop;
 }
 
-static bool handleIdlException(yyscan_t yyscanner,const QCString &cmd, const QCStringList &)
+static bool handleIdlException(yyscan_t yyscanner,const QCString &cmd, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::EXCEPTIONDOC_SEC);
@@ -2057,7 +2056,7 @@ static bool handleIdlException(yyscan_t yyscanner,const QCString &cmd, const QCS
   return stop;
 }
 
-static bool handlePage(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handlePage(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::PAGEDOC_SEC);
@@ -2065,7 +2064,7 @@ static bool handlePage(yyscan_t yyscanner,const QCString &, const QCStringList &
   return stop;
 }
 
-static bool handleMainpage(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleMainpage(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::MAINPAGEDOC_SEC);
@@ -2078,7 +2077,7 @@ static bool handleMainpage(yyscan_t yyscanner,const QCString &, const QCStringLi
   return stop;
 }
 
-static bool handleFile(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleFile(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::FILEDOC_SEC);
@@ -2090,7 +2089,7 @@ static bool handleFile(yyscan_t yyscanner,const QCString &, const QCStringList &
   return stop;
 }
 
-static bool handleParam(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleParam(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   // we need process param and retval arguments to escape leading underscores in case of
@@ -2100,7 +2099,7 @@ static bool handleParam(yyscan_t yyscanner,const QCString &, const QCStringList
   return FALSE;
 }
 
-static bool handleRetval(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleRetval(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   addOutput(yyscanner,"@retval ");
@@ -2108,7 +2107,7 @@ static bool handleRetval(yyscan_t yyscanner,const QCString &, const QCStringList
   return FALSE;
 }
 
-static bool handleDir(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleDir(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::DIRDOC_SEC);
@@ -2117,14 +2116,12 @@ static bool handleDir(yyscan_t yyscanner,const QCString &, const QCStringList &)
   return stop;
 }
 
-static bool handleExample(yyscan_t yyscanner,const QCString &cmd, const QCStringList &optList)
+static bool handleExample(yyscan_t yyscanner,const QCString &cmd, const StringVector &optList)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   Entry::Sections section=Entry::EXAMPLE_SEC;
-  QCStringList::ConstIterator it;
-  for ( it = optList.begin(); it != optList.end(); ++it )
+  for (const auto &opt : optList)
   {
-    QCString opt = (*it).stripWhiteSpace().lower();
     if (opt=="lineno")
     {
       section=Entry::EXAMPLE_LINENO_SEC;
@@ -2132,7 +2129,7 @@ static bool handleExample(yyscan_t yyscanner,const QCString &cmd, const QCString
     else
     {
       warn(yyextra->fileName,yyextra->lineNr,
-          "unsupported option '%s' for command '\\%s'",qPrint(opt),qPrint(cmd));
+          "unsupported option '%s' for command '\\%s'",opt.c_str(),qPrint(cmd));
     }
   }
   bool stop=makeStructuralIndicator(yyscanner,section);
@@ -2141,7 +2138,7 @@ static bool handleExample(yyscan_t yyscanner,const QCString &cmd, const QCString
   return stop;
 }
 
-static bool handleDetails(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleDetails(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (yyextra->inContext!=OutputBrief)
@@ -2153,14 +2150,14 @@ static bool handleDetails(yyscan_t yyscanner,const QCString &, const QCStringLis
   return FALSE;
 }
 
-static bool handleNoop(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleNoop(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   BEGIN( Noop );
   return FALSE;
 }
 
-static bool handleName(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleName(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool stop=makeStructuralIndicator(yyscanner,Entry::MEMBERGRP_SEC);
@@ -2176,7 +2173,7 @@ static bool handleName(yyscan_t yyscanner,const QCString &, const QCStringList &
   return stop;
 }
 
-static bool handleTodo(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleTodo(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->newXRefKind = XRef_Todo;
@@ -2185,7 +2182,7 @@ static bool handleTodo(yyscan_t yyscanner,const QCString &, const QCStringList &
   return FALSE;
 }
 
-static bool handleTest(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleTest(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->newXRefKind = XRef_Test;
@@ -2194,7 +2191,7 @@ static bool handleTest(yyscan_t yyscanner,const QCString &, const QCStringList &
   return FALSE;
 }
 
-static bool handleBug(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleBug(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->newXRefKind = XRef_Bug;
@@ -2203,7 +2200,7 @@ static bool handleBug(yyscan_t yyscanner,const QCString &, const QCStringList &)
   return FALSE;
 }
 
-static bool handleDeprecated(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleDeprecated(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->newXRefKind = XRef_Deprecated;
@@ -2212,7 +2209,7 @@ static bool handleDeprecated(yyscan_t yyscanner,const QCString &, const QCString
   return FALSE;
 }
 
-static bool handleXRefItem(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleXRefItem(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->newXRefKind = XRef_Item;
@@ -2220,7 +2217,7 @@ static bool handleXRefItem(yyscan_t yyscanner,const QCString &, const QCStringLi
   return FALSE;
 }
 
-static bool handleParBlock(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleParBlock(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (yyextra->insideParBlock)
@@ -2238,7 +2235,7 @@ static bool handleParBlock(yyscan_t yyscanner,const QCString &, const QCStringLi
   return FALSE;
 }
 
-static bool handleEndParBlock(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleEndParBlock(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (!yyextra->insideParBlock)
@@ -2252,7 +2249,7 @@ static bool handleEndParBlock(yyscan_t yyscanner,const QCString &, const QCStrin
   return FALSE;
 }
 
-static bool handleRelated(yyscan_t yyscanner,const QCString &cmd, const QCStringList &)
+static bool handleRelated(yyscan_t yyscanner,const QCString &cmd, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (!yyextra->current->relates.isEmpty())
@@ -2265,7 +2262,7 @@ static bool handleRelated(yyscan_t yyscanner,const QCString &cmd, const QCString
   return FALSE;
 }
 
-static bool handleRelatedAlso(yyscan_t yyscanner,const QCString &cmd, const QCStringList &)
+static bool handleRelatedAlso(yyscan_t yyscanner,const QCString &cmd, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (!yyextra->current->relates.isEmpty())
@@ -2279,7 +2276,7 @@ static bool handleRelatedAlso(yyscan_t yyscanner,const QCString &cmd, const QCSt
   return FALSE;
 }
 
-static bool handleMemberOf(yyscan_t yyscanner,const QCString &cmd, const QCStringList &)
+static bool handleMemberOf(yyscan_t yyscanner,const QCString &cmd, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (!yyextra->current->relates.isEmpty())
@@ -2293,7 +2290,7 @@ static bool handleMemberOf(yyscan_t yyscanner,const QCString &cmd, const QCStrin
   return FALSE;
 }
 
-static bool handleRefItem(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleRefItem(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   addOutput(yyscanner,"@refitem ");
@@ -2301,7 +2298,7 @@ static bool handleRefItem(yyscan_t yyscanner,const QCString &, const QCStringLis
   return FALSE;
 }
 
-static bool handleSection(yyscan_t yyscanner,const QCString &s, const QCStringList &)
+static bool handleSection(yyscan_t yyscanner,const QCString &s, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   setOutput(yyscanner,OutputDoc);
@@ -2314,7 +2311,7 @@ static bool handleSection(yyscan_t yyscanner,const QCString &s, const QCStringLi
   return FALSE;
 }
 
-static bool handleSubpage(yyscan_t yyscanner,const QCString &s, const QCStringList &)
+static bool handleSubpage(yyscan_t yyscanner,const QCString &s, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (yyextra->current->section!=Entry::EMPTY_SEC &&
@@ -2335,7 +2332,7 @@ static bool handleSubpage(yyscan_t yyscanner,const QCString &s, const QCStringLi
   return FALSE;
 }
 
-static bool handleAnchor(yyscan_t yyscanner,const QCString &s, const QCStringList &)
+static bool handleAnchor(yyscan_t yyscanner,const QCString &s, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   addOutput(yyscanner,"@"+s+" ");
@@ -2343,7 +2340,7 @@ static bool handleAnchor(yyscan_t yyscanner,const QCString &s, const QCStringLis
   return FALSE;
 }
 
-static bool handleCite(yyscan_t yyscanner,const QCString &s, const QCStringList &)
+static bool handleCite(yyscan_t yyscanner,const QCString &s, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (!yyextra->spaceBeforeCmd.isEmpty())
@@ -2356,16 +2353,16 @@ static bool handleCite(yyscan_t yyscanner,const QCString &s, const QCStringList
   return FALSE;
 }
 
-static bool handleFormatBlock(yyscan_t yyscanner,const QCString &s, const QCStringList &optList)
+static bool handleFormatBlock(yyscan_t yyscanner,const QCString &s, const StringVector &optList)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
-  if (optList.isEmpty())
+  if (optList.empty())
   {
     addOutput(yyscanner,"@"+s+" ");
   }
   else
   {
-    addOutput(yyscanner,"@"+s+"{"+optList.join(",")+"} ");
+    addOutput(yyscanner,"@"+s+"{"+join(optList,",")+"} ");
   }
   //printf("handleFormatBlock(%s) with option(%s)\n",s.data(),opt.data());
   yyextra->blockName=s;
@@ -2374,7 +2371,7 @@ static bool handleFormatBlock(yyscan_t yyscanner,const QCString &s, const QCStri
   return FALSE;
 }
 
-static bool handleAddIndex(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleAddIndex(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   addOutput(yyscanner,"@addindex ");
@@ -2382,7 +2379,7 @@ static bool handleAddIndex(yyscan_t yyscanner,const QCString &, const QCStringLi
   return FALSE;
 }
 
-static bool handleIf(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleIf(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->enabledSectionFound=FALSE;
@@ -2392,7 +2389,7 @@ static bool handleIf(yyscan_t yyscanner,const QCString &, const QCStringList &)
   return FALSE;
 }
 
-static bool handleIfNot(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleIfNot(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->enabledSectionFound=FALSE;
@@ -2402,7 +2399,7 @@ static bool handleIfNot(yyscan_t yyscanner,const QCString &, const QCStringList
   return FALSE;
 }
 
-static bool handleElseIf(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleElseIf(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (yyextra->guards.empty())
@@ -2419,7 +2416,7 @@ static bool handleElseIf(yyscan_t yyscanner,const QCString &, const QCStringList
   return FALSE;
 }
 
-static bool handleElse(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleElse(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (yyextra->guards.empty())
@@ -2435,7 +2432,7 @@ static bool handleElse(yyscan_t yyscanner,const QCString &, const QCStringList &
   return FALSE;
 }
 
-static bool handleEndIf(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleEndIf(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (yyextra->guards.empty())
@@ -2457,7 +2454,7 @@ static bool handleEndIf(yyscan_t yyscanner,const QCString &, const QCStringList
   return FALSE;
 }
 
-static bool handleIngroup(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleIngroup(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->inGroupParamFound=FALSE;
@@ -2465,84 +2462,84 @@ static bool handleIngroup(yyscan_t yyscanner,const QCString &, const QCStringLis
   return FALSE;
 }
 
-static bool handleNoSubGrouping(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleNoSubGrouping(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->subGrouping = FALSE;
   return FALSE;
 }
 
-static bool handleShowInitializer(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleShowInitializer(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->initLines = 100000; // ON
   return FALSE;
 }
 
-static bool handleHideInitializer(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleHideInitializer(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->initLines = 0; // OFF
   return FALSE;
 }
 
-static bool handleCallgraph(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleCallgraph(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->callGraph = TRUE; // ON
   return FALSE;
 }
 
-static bool handleHideCallgraph(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleHideCallgraph(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->callGraph = FALSE; // OFF
   return FALSE;
 }
 
-static bool handleCallergraph(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleCallergraph(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->callerGraph = TRUE; // ON
   return FALSE;
 }
 
-static bool handleHideCallergraph(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleHideCallergraph(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->callerGraph = FALSE; // OFF
   return FALSE;
 }
 
-static bool handleReferencedByRelation(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleReferencedByRelation(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->referencedByRelation = TRUE; // ON
   return FALSE;
 }
 
-static bool handleHideReferencedByRelation(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleHideReferencedByRelation(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->referencedByRelation = FALSE; // OFF
   return FALSE;
 }
 
-static bool handleReferencesRelation(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleReferencesRelation(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->referencesRelation = TRUE; // ON
   return FALSE;
 }
 
-static bool handleHideReferencesRelation(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleHideReferencesRelation(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->referencesRelation = FALSE; // OFF
   return FALSE;
 }
 
-static bool handleInternal(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleInternal(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (!Config_getBool(INTERNAL_DOCS))
@@ -2565,72 +2562,71 @@ static bool handleInternal(yyscan_t yyscanner,const QCString &, const QCStringLi
   return FALSE;
 }
 
-static bool handleStatic(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleStatic(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->stat = TRUE;
   return FALSE;
 }
 
-static bool handlePure(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handlePure(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->virt = Pure;
   return FALSE;
 }
 
-static bool handlePrivate(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handlePrivate(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->protection = Private;
   return FALSE;
 }
 
-static bool handlePrivateSection(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handlePrivateSection(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->protection = yyextra->protection = Private;
   return FALSE;
 }
 
-static bool handleProtected(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleProtected(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->protection = Protected;
   return FALSE;
 }
 
-static bool handleProtectedSection(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleProtectedSection(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->protection = yyextra->protection = Protected ;
   return FALSE;
 }
 
-static bool handlePublic(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handlePublic(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->protection = Public;
   return FALSE;
 }
 
-static bool handlePublicSection(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handlePublicSection(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->current->protection = yyextra->protection = Public;
   return FALSE;
 }
 
-static bool handleToc(yyscan_t yyscanner,const QCString &, const QCStringList &optList)
+static bool handleToc(yyscan_t yyscanner,const QCString &, const StringVector &optList)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (yyextra->current->section==Entry::PAGEDOC_SEC ||
       yyextra->current->section==Entry::MAINPAGEDOC_SEC)
   {
-    QCStringList::ConstIterator it;
-    for ( it = optList.begin(); it != optList.end(); ++it )
+    for (const auto &opt_ : optList)
     {
-      QCString opt = (*it).stripWhiteSpace().lower();
+      QCString opt = QCString(opt_).stripWhiteSpace().lower();
       char dum;
       int level = 5;
       int i = opt.find(':');
@@ -2638,7 +2634,7 @@ static bool handleToc(yyscan_t yyscanner,const QCString &, const QCStringList &o
       {
         if (sscanf(opt.right(opt.length() - i - 1).data(),"%d%c",&level,&dum) != 1)
         {
-          warn(yyextra->fileName,yyextra->lineNr,"Unknown option:level specified with \\tableofcontents: '%s'", (*it).stripWhiteSpace().data());
+          warn(yyextra->fileName,yyextra->lineNr,"Unknown option:level specified with \\tableofcontents: '%s'", QCString(opt_).stripWhiteSpace().data());
           opt = "";
         }
         else
@@ -2668,7 +2664,7 @@ static bool handleToc(yyscan_t yyscanner,const QCString &, const QCStringList &o
         }
         else
         {
-          warn(yyextra->fileName,yyextra->lineNr,"Unknown option specified with \\tableofcontents: '%s'", (*it).stripWhiteSpace().data());
+          warn(yyextra->fileName,yyextra->lineNr,"Unknown option specified with \\tableofcontents: '%s'", QCString(opt_).stripWhiteSpace().data());
         }
       }
     }
@@ -2682,14 +2678,14 @@ static bool handleToc(yyscan_t yyscanner,const QCString &, const QCStringList &o
   return FALSE;
 }
 
-static bool handleInherit(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleInherit(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   BEGIN(InheritParam);
   return FALSE;
 }
 
-static bool handleExtends(yyscan_t yyscanner,const QCString &cmd, const QCStringList &)
+static bool handleExtends(yyscan_t yyscanner,const QCString &cmd, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   yyextra->currentCmd = cmd;
@@ -2697,7 +2693,7 @@ static bool handleExtends(yyscan_t yyscanner,const QCString &cmd, const QCString
   return FALSE;
 }
 
-static bool handleCopyBrief(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleCopyBrief(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (yyextra->current->brief.isEmpty() && yyextra->current->doc.isEmpty())
@@ -2715,7 +2711,7 @@ static bool handleCopyBrief(yyscan_t yyscanner,const QCString &, const QCStringL
   return FALSE;
 }
 
-static bool handleCopyDetails(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleCopyDetails(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   setOutput(yyscanner,OutputDoc);
@@ -2728,7 +2724,7 @@ static bool handleCopyDetails(yyscan_t yyscanner,const QCString &, const QCStrin
   return FALSE;
 }
 
-static bool handleCopyDoc(yyscan_t yyscanner,const QCString &, const QCStringList &)
+static bool handleCopyDoc(yyscan_t yyscanner,const QCString &, const StringVector &)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   setOutput(yyscanner,OutputBrief);
diff --git a/src/defargs.l b/src/defargs.l
index 36ed99c..528d44c 100644
--- a/src/defargs.l
+++ b/src/defargs.l
@@ -56,7 +56,6 @@
 //#include <iostream.h>
 #include <assert.h>
 #include <ctype.h>
-#include <qcstringlist.h>
 
 #include "defargs.h"
 #include "entry.h"
diff --git a/src/dir.cpp b/src/dir.cpp
index 558045b..df1665f 100644
--- a/src/dir.cpp
+++ b/src/dir.cpp
@@ -196,7 +196,8 @@ bool Dir::exists(const std::string &path,bool acceptsAbsPath) const
 
 bool Dir::exists() const
 {
-  return exists(p->path.string());
+  FileInfo fi(p->path);
+  return fi.exists() && fi.isDir();
 }
 
 bool Dir::isRelative() const
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 22b7341..4965953 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -19,7 +19,6 @@
 
 #include <qcstring.h>
 #include <ctype.h>
-#include <qcstringlist.h>
 
 #include "regex.h"
 #include "doxygen.h"
@@ -5060,24 +5059,28 @@ void DocPara::handleInclude(const QCString &cmdName,DocInclude::Type t)
     doctokenizerYYsetStateOptions();
     tok=doctokenizerYYlex();
     doctokenizerYYsetStatePara();
-    QCStringList optList=QCStringList::split(",",g_token->name);
-    if (t==DocInclude::Include && optList.contains("lineno"))
+    StringVector optList=split(g_token->name.str(),",");
+    auto contains = [&optList](const char *kw)
+    {
+      return std::find(optList.begin(),optList.end(),kw)!=optList.end();
+    };
+    if (t==DocInclude::Include && contains("lineno"))
     {
       t = DocInclude::IncWithLines;
     }
-    else if (t==DocInclude::Snippet && optList.contains("lineno"))
+    else if (t==DocInclude::Snippet && contains("lineno"))
     {
       t = DocInclude::SnipWithLines;
     }
-    else if (t==DocInclude::DontInclude && optList.contains("lineno"))
+    else if (t==DocInclude::DontInclude && contains("lineno"))
     {
       t = DocInclude::DontIncWithLines;
     }
-    else if (t==DocInclude::Include && optList.contains("doc"))
+    else if (t==DocInclude::Include && contains("doc"))
     {
       t = DocInclude::IncludeDoc;
     }
-    else if (t==DocInclude::Snippet && optList.contains("doc"))
+    else if (t==DocInclude::Snippet && contains("doc"))
     {
       t = DocInclude::SnippetDoc;
     }
diff --git a/src/index.cpp b/src/index.cpp
index 5554987..92c9f37 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -4428,7 +4428,7 @@ static void writeIndex(OutputList &ol)
   ol.popGeneratorState();
 }
 
-static QArray<bool> indexWritten;
+static std::vector<bool> indexWritten;
 
 static void writeIndexHierarchyEntries(OutputList &ol,const LayoutNavEntryList &entries)
 {
diff --git a/qtools/qcstring.cpp b/src/qcstring.cpp
index 4f30a42..2a595cd 100644
--- a/qtools/qcstring.cpp
+++ b/src/qcstring.cpp
@@ -15,14 +15,11 @@
 
 #include "qcstring.h"
 
-#include <qstring.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <ctype.h>
-//#include <qregexp.h>
-#include <qdatastream.h>
 
 QCString &QCString::sprintf( const char *format, ... )
 {
@@ -86,15 +83,6 @@ int QCString::find( const QCString &str, int index, bool cs ) const
   return find(str.data(),index,cs);
 }
 
-#if 0
-int QCString::find( const QRegExp &rx, int index ) const
-{
-  if ( index < 0 )
-    index += length();
-  return rx.match( data(), index );
-}
-#endif
-
 int QCString::findRev( char c, int index, bool cs) const
 {
   const char *b = data();
@@ -147,22 +135,6 @@ int QCString::findRev( const char *str, int index, bool cs) const
   return -1;
 }
 
-#if 0
-int QCString::findRev( const QRegExp &rx, int index ) const
-{
-  if ( index < 0 )			// neg index ==> start from end
-    index += length();
-  if ( (uint)index > length() )		// bad index
-    return -1;
-  while( index >= 0 ) {
-    if ( rx.match( data(), index ) == index )
-      return index;
-    index--;
-  }
-  return -1;
-}
-#endif
-
 int QCString::contains( char c, bool cs ) const
 {
   if (length()==0) return 0;
@@ -205,25 +177,6 @@ int QCString::contains( const char *str, bool cs ) const
   return count;
 }
 
-#if 0
-int QCString::contains( const QRegExp &rx ) const
-{
-  if ( isEmpty() )
-    return rx.match( data() ) < 0 ? 0 : 1;
-  int count = 0;
-  int index = -1;
-  int len = length();
-  while ( index < len-1 ) {			// count overlapping matches
-    index = rx.match( data(), index+1 );
-    if ( index < 0 )
-      break;
-    count++;
-  }
-  return count;
-}
-#endif
-
-
 QCString QCString::simplifyWhiteSpace() const
 {
   if ( isEmpty() )                            // nothing to do
@@ -258,29 +211,6 @@ QCString &QCString::replace( uint index, uint len, const char *s)
   return *this;
 }
 
-#if 0
-QCString &QCString::replace( const QRegExp &rx, const char *str )
-{
-  if ( isEmpty() )
-    return *this;
-  int index = 0;
-  int slen  = qstrlen(str);
-  int len;
-  while ( index < (int)length() ) {
-    index = rx.match( data(), index, &len, FALSE );
-    if ( index >= 0 ) {
-      replace( index, len, str );
-      index += slen;
-      if ( !len )
-        break;	// Avoid infinite loop on 0-length matches, e.g. [a-z]*
-    }
-    else
-      break;
-  }
-  return *this;
-}
-#endif
-
 static bool ok_in_base( char c, int base )
 {
     if ( base <= 10 )
@@ -487,7 +417,6 @@ char *qstrdup( const char *str )
     if ( !str )
 	return 0;
     char *dst = new char[qstrlen(str)+1];
-    CHECK_PTR( dst );
     return strcpy( dst, str );
 }
 
@@ -532,58 +461,6 @@ int qstrnicmp( const char *str1, const char *str2, uint len )
     return 0;
 }
 
-#ifndef QT_NO_DATASTREAM
-
-QDataStream &operator<<( QDataStream &s, const QByteArray &a )
-{
-    return s.writeBytes( a.data(), a.size() );
-}
-
-QDataStream &operator>>( QDataStream &s, QByteArray &a )
-{
-    Q_UINT32 len;
-    s >> len;					// read size of array
-    if ( len == 0 || s.eof() ) {		// end of file reached
-	a.resize( 0 );
-	return s;
-    }
-    if ( !a.resize( (uint)len ) ) {		// resize array
-#if defined(CHECK_NULL)
-	qWarning( "QDataStream: Not enough memory to read QByteArray" );
-#endif
-	len = 0;
-    }
-    if ( len > 0 )				// not null array
-	s.readRawBytes( a.data(), (uint)len );
-    return s;
-}
-
-QDataStream &operator<<( QDataStream &s, const QCString &str )
-{
-    return s.writeBytes( str.data(), str.size() );
-}
-
-QDataStream &operator>>( QDataStream &s, QCString &str )
-{
-    Q_UINT32 len;
-    s >> len;					// read size of string
-    if ( len == 0 || s.eof() ) {		// end of file reached
-	str.resize( 0 );
-	return s;
-    }
-    if ( !str.resize( (uint)len )) {// resize string
-#if defined(CHECK_NULL)
-	qWarning( "QDataStream: Not enough memory to read QCString" );
-#endif
-	len = 0;
-    }
-    if ( len > 0 )				// not null array
-	s.readRawBytes( str.rawData(), (uint)len );
-    return s;
-}
-
-#endif //QT_NO_DATASTREAM
-
 /// substitute all occurrences of \a src in \a s by \a dst
 QCString substitute(const QCString &s,const QCString &src,const QCString &dst)
 {
diff --git a/qtools/qcstring.h b/src/qcstring.h
index 2efdc2d..6e2802d 100644
--- a/qtools/qcstring.h
+++ b/src/qcstring.h
@@ -17,10 +17,6 @@
 #ifndef QCSTRING_H
 #define QCSTRING_H
 
-#ifndef QT_H
-#include "qarray.h"
-#endif // QT_H
-
 #include <string>
 #include <algorithm>
 
@@ -31,6 +27,20 @@
 #include <cstdint>
 #include <ostream>
 
+const bool FALSE = false;
+const bool TRUE = true;
+typedef unsigned char	uchar;
+typedef unsigned short	ushort;
+typedef unsigned	uint;
+typedef unsigned long	ulong;
+typedef int64_t         int64;
+typedef uint64_t        uint64;
+#define QMAX(a,b)	((a) > (b) ? (a) : (b))
+#define QMIN(a,b)	((a) < (b) ? (a) : (b))
+#define ASSERT(x)  if ( !(x) )\
+	fprintf(stderr,"ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)
+
+
 /*****************************************************************************
   Safe and portable C string functions; extensions to standard string.h
  *****************************************************************************/
@@ -76,25 +86,6 @@ int qstricmp( const char *str1, const char *str2 );
 
 int qstrnicmp( const char *str1, const char *str2, uint len );
 
-/*****************************************************************************
-  QByteArray class
- *****************************************************************************/
-
-#if defined(Q_TEMPLATEDLL)
-template class QArray<char>;
-#endif
-typedef QArray<char> QByteArray;
-
-/*****************************************************************************
-  QByteArray stream functions
- *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
-QDataStream &operator<<( QDataStream &, const QByteArray & );
-QDataStream &operator>>( QDataStream &, QByteArray & );
-#endif
-
-//class QRegExp;
-
 /** This is an alternative implementation of QCString. It provides basically
  *  the same functions but uses std::string as the underlying string type
  */
@@ -400,14 +391,6 @@ class QCString
 };
 
 /*****************************************************************************
-  QCString stream functions
- *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
-QDataStream &operator<<( QDataStream &, const QCString & );
-QDataStream &operator>>( QDataStream &, QCString & );
-#endif
-
-/*****************************************************************************
   QCString non-member operators
  *****************************************************************************/
 
diff --git a/src/qhp.cpp b/src/qhp.cpp
index 181ed67..dd199ad 100644
--- a/src/qhp.cpp
+++ b/src/qhp.cpp
@@ -22,9 +22,9 @@
 #include "groupdef.h"
 #include "doxygen.h"
 #include "filedef.h"
+#include "util.h"
 
 #include <fstream>
-#include <qcstringlist.h>
 #include <string.h>
 
 static QCString makeFileName(const char * withoutExtension)
@@ -101,10 +101,11 @@ void Qhp::initialize()
     { "name", filterName, 0 };
     m_doc.open("customFilter", tagAttributes);
 
-    QCStringList customFilterAttributes = QCStringList::split(' ', Config_getString(QHP_CUST_FILTER_ATTRS));
-    for (int i = 0; i < (int)customFilterAttributes.count(); i++)
+    StringVector customFilterAttributes =
+        split(Config_getString(QHP_CUST_FILTER_ATTRS).str(), " ");
+    for (const auto &attr : customFilterAttributes)
     {
-      m_doc.openCloseContent("filterAttribute", customFilterAttributes[i]);
+      m_doc.openCloseContent("filterAttribute", attr.c_str());
     }
     m_doc.close("customFilter");
   }
@@ -112,15 +113,16 @@ void Qhp::initialize()
   m_doc.open("filterSection");
 
   // Add section attributes
-  QCStringList sectionFilterAttributes = QCStringList::split(' ',
-      Config_getString(QHP_SECT_FILTER_ATTRS));
-  if (!sectionFilterAttributes.contains("doxygen"))
+  StringVector sectionFilterAttributes =
+      split(Config_getString(QHP_SECT_FILTER_ATTRS).str(), " ");
+  if (std::find(sectionFilterAttributes.begin(), sectionFilterAttributes.end(), "doxygen") ==
+      sectionFilterAttributes.end())
   {
-    sectionFilterAttributes << "doxygen";
+    sectionFilterAttributes.push_back("doxygen");
   }
-  for (int i = 0; i < (int)sectionFilterAttributes.count(); i++)
+  for (const auto &attr : sectionFilterAttributes)
   {
-    m_doc.openCloseContent("filterAttribute", sectionFilterAttributes[i]);
+    m_doc.openCloseContent("filterAttribute", attr.c_str());
   }
 
   m_toc.open("toc");
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index 49e97f2..bb49a18 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -2313,7 +2313,7 @@ static void encodeForOutput(std::ostream &t,const char *s)
   QCString encoding;
   bool converted=FALSE;
   int l = qstrlen(s);
-  static QByteArray enc;
+  static std::vector<char> enc;
   if (l*4>(int)enc.size()) enc.resize(l*4); // worst case
   encoding.sprintf("CP%s",theTranslator->trRTFansicp().data());
   if (!encoding.isEmpty())
@@ -2325,7 +2325,7 @@ static void encodeForOutput(std::ostream &t,const char *s)
       size_t iLeft=l;
       size_t oLeft=enc.size();
       char *inputPtr = (char*)s;
-      char *outputPtr = enc.data();
+      char *outputPtr = &enc[0];
       if (!portable_iconv(cd, &inputPtr, &iLeft, &outputPtr, &oLeft))
       {
         enc.resize(enc.size()-(unsigned int)oLeft);
diff --git a/src/util.cpp b/src/util.cpp
index f402bac..c5bc40e 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -7396,3 +7396,17 @@ int findIndex(const std::string &s,const reg::Ex &re)
   return reg::search(s,match,re) ? (int)match.position() : -1;
 }
 
+/// create a string where the string in the vector are joined by the given delimiter
+std::string join(const StringVector &sv,const std::string &delimiter)
+{
+  std::string result;
+  bool first=true;
+  for (const auto &s : sv)
+  {
+    if (!first) result+=delimiter;
+    first=false;
+    result+=s;
+  }
+  return result;
+}
+
diff --git a/src/util.h b/src/util.h
index d8f77af..1811447 100644
--- a/src/util.h
+++ b/src/util.h
@@ -446,6 +446,7 @@ StringVector split(const std::string &s,const std::string &delimiter);
 StringVector split(const std::string &s,const reg::Ex &delimiter);
 int findIndex(const StringVector &sv,const std::string &s);
 int findIndex(const std::string &s,const reg::Ex &re);
+std::string join(const StringVector &s,const std::string &delimiter);
 
 bool recognizeFixedForm(const char* contents, FortranFormat format);
 FortranFormat convertFileNameFortranParserCode(QCString fn);
diff --git a/src/vhdlcode.l b/src/vhdlcode.l
index 29a8e0b..36b7e6d 100644
--- a/src/vhdlcode.l
+++ b/src/vhdlcode.l
@@ -37,7 +37,6 @@
 #include <stdio.h>
 #include <assert.h>
 #include <ctype.h>
-#include <qcstringlist.h>
 
 #include "vhdlcode.h"
 #include "entry.h"
@@ -573,26 +572,25 @@ XILINX      "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI
                                     }
 
 <ParsePackage>[^:;]*                { //found package
-                                      QCString temp(yytext);
-                                      QCStringList strl=QCStringList::split(".",temp);
-                                      if (strl.count()>2)
+                                      StringVector strl=split(yytext,".");
+                                      if (strl.size()>2)
                                       {
-                                        QCString s1=strl[0];
-                                        QCString s2=strl[1];
-                                        QCString s3=strl[2];
+                                        std::string s1=strl[0];
+                                        std::string s2=strl[1];
+                                        std::string s3=strl[2];
                                         s1.append(".");
-                                        s3.prepend(".");
-                                        codifyLines(yyscanner,s1.data(),yyextra->currClass.data());
-                                        ClassDef *cd=VhdlDocGen::getPackageName(s2);
+                                        s3.insert(0,".");
+                                        codifyLines(yyscanner,s1.c_str(),yyextra->currClass.data());
+                                        ClassDef *cd=VhdlDocGen::getPackageName(s2.c_str());
                                         if (cd)
                                         {
-                                          generateClassOrGlobalLink(yyscanner,*yyextra->code,s2.data());
+                                          generateClassOrGlobalLink(yyscanner,*yyextra->code,s2.c_str());
                                         }
                                         else
                                         {
-                                          codifyLines(yyscanner,s2.data());
+                                          codifyLines(yyscanner,s2.c_str());
                                         }
-                                        codifyLines(yyscanner,s3.data());
+                                        codifyLines(yyscanner,s3.c_str());
                                       }
                                       else
                                       {
@@ -677,9 +675,9 @@ XILINX      "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI
 <Bases>^{B}*("package "){BN}*("body"){BN}*{FUNCNAME}  { // found package body
                                       QCString ss(yytext);
                                       QCString temp=VhdlDocGen::getIndexWord(yytext,2);
-                                      QCStringList ql=QCStringList::split(temp,ss);
-                                      QCString ll=ql[0];
-                                      codifyLines(yyscanner,ll.data(),yyextra->currClass.data());
+                                      StringVector ql=split(yytext,temp.str());
+                                      std::string ll=ql[0];
+                                      codifyLines(yyscanner,ll.c_str(),yyextra->currClass.data());
                                       temp=temp.stripWhiteSpace();
                                       temp.prepend("_");
                                       generateClassOrGlobalLink(yyscanner,*yyextra->code,temp.data());
@@ -1500,7 +1498,7 @@ static void writeFuncProto(yyscan_t yyscanner)
     codifyLines(yyscanner,yyextra->funcProto.data(),yyextra->currClass.data());
     return;
   }
-  QCStringList qlist=QCStringList::split(name,yyextra->funcProto);
+  StringVector qlist=split(yyextra->funcProto.str(),name.str());
   QCString temp=qlist[0];
   codifyLines(yyscanner,temp.data(),yyextra->currClass.data());
   yyextra->funcProto.stripPrefix(temp.data());
diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index 87dcd72..07ee7ad 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -28,7 +28,6 @@
 #include <algorithm>
 
 #include <qcstring.h>
-#include <qcstringlist.h>
 
 /* --------------------------------------------------------------- */
 
@@ -858,7 +857,7 @@ void VhdlDocGen::writeInlineClassLink(const ClassDef* cd ,OutputList& ol)
   }
   else if (ii==VhdlDocGen::ARCHITECTURE)
   {
-    QCStringList qlist=QCStringList::split("-",nn);
+    StringVector qlist=split(nn.str(),"-");
     nn=qlist[1];
     cd=VhdlDocGen::getClass(nn.data());
   }
@@ -869,7 +868,7 @@ void VhdlDocGen::writeInlineClassLink(const ClassDef* cd ,OutputList& ol)
     VhdlDocGen::findAllArchitectures(ql,cd);
     for (const auto &s : ql)
     {
-      QCStringList qlist=QCStringList::split("-",s);
+      StringVector qlist=split(s.str(),"-");
       QCString s1=qlist[0];
       QCString s2=qlist[1];
       s1.stripPrefix("_");
@@ -917,8 +916,8 @@ const ClassDef* VhdlDocGen::findArchitecture(const ClassDef *cd)
   for (const auto &citer : *Doxygen::classLinkedMap)
   {
     QCString jj=citer->name();
-    QCStringList ql=QCStringList::split(":",jj);
-    if (ql.count()>1)
+    StringVector ql=split(jj.str(),":");
+    if (ql.size()>1)
     {
       if (ql[0]==nn )
       {
@@ -2626,12 +2625,12 @@ void VhdlDocGen::writeRecUnitDocu(
     QCString largs)
 {
 
-  QCStringList ql=QCStringList::split("#",largs);
-  uint len=ql.count();
+  StringVector ql=split(largs.str(),"#");
+  size_t len=ql.size();
   ol.startParameterList(TRUE);
   bool first=TRUE;
 
-  for(uint i=0;i<len;i++)
+  for(size_t i=0;i<len;i++)
   {
     QCString n=ql[i];
     ol.startParameterType(first,"");
@@ -3053,14 +3052,14 @@ void FlowChart::alignCommentNode(std::ostream &t,QCString com)
 {
   uint max=0;
   QCString s;
-  QCStringList ql=QCStringList::split("\n",com);
-  for (uint j=0;j<ql.count();j++)
+  StringVector ql=split(com.str(),"\n");
+  for (size_t j=0;j<ql.size();j++)
   {
-    s=(QCString)ql[j];
+    s=ql[j];
     if (max<s.length()) max=s.length();
   }
 
-  s=ql.last();
+  s=ql.back();
   int diff=max-s.length();
 
   QCString n(1);
@@ -3069,14 +3068,14 @@ void FlowChart::alignCommentNode(std::ostream &t,QCString com)
     n.fill(' ',2*diff);
     n.append(".");
     s+=n;
-    ql.remove(ql.last());
-    ql.append(s);
+    ql.pop_back();
+    ql.push_back(s.str());
   }
 
-  for (uint j=0;j<ql.count();j++)
+  for (size_t j=0;j<ql.size();j++)
   {
     s=ql[j];
-    if (j<ql.count()-1)
+    if (j<ql.size()-1)
     {
       s+="\n";
     }
diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp
index ac4e2db..4f68728 100644
--- a/src/vhdljjparser.cpp
+++ b/src/vhdljjparser.cpp
@@ -318,12 +318,13 @@ int VHDLOutlineParser::checkInlineCode(QCString &doc)
   code = stripLeadingAndTrailingEmptyLines(code, iLine);
   int val = code.contains('\n');
   VhdlDocGen::prepareComment(p->strComment);
-  QCStringList ql = QCStringList::split('\n', p->strComment);
+  StringVector ql = split(p->strComment.str(),"\n");
 
   QCString co;
   QCString na;
-  for (QCString qcs : ql)
+  for (const auto &qcs_ : ql)
   {
+    QCString qcs = qcs_;
     qcs = qcs.simplifyWhiteSpace();
     if (findRe(qcs,csRe)!=-1)
     {
@@ -521,9 +522,9 @@ void VHDLOutlineParser::addVhdlType(const char *n,int startLine,int section,
     spec= VhdlDocGen::GENERIC;
   }
 
-  QCStringList ql=QCStringList::split(",",name);
+  StringVector ql=split(name.str(),",");
 
-  for (uint u=0;u<ql.count();u++)
+  for (size_t u=0;u<ql.size();u++)
   {
     s->current->name=ql[u];
     s->current->startLine=startLine;
@@ -583,11 +584,11 @@ void VHDLOutlineParser::createFunction(const char *imp,uint64 spec,const char *f
     VhdlDocGen::deleteAllChars(s->current->args,' ');
     if (!fname.isEmpty())
     {
-      QCStringList q1=QCStringList::split(",",fname);
-      for (uint ii=0;ii<q1.count();ii++)
+      StringVector q1=split(fname.str(),",");
+      for (const auto &name : q1)
       {
         Argument arg;
-        arg.name=q1[ii];
+        arg.name=name;
         s->current->argList.push_back(arg);
       }
     }
@@ -630,12 +631,12 @@ void VHDLOutlineParser::addProto(const char *s1,const char *s2,const char *s3,
   VhdlParser::SharedState *s = &p->shared;
   (void)s5; // avoid unused warning
   QCString name=s2;
-  QCStringList ql=QCStringList::split(",",name);
+  StringVector ql=split(name.str(),",");
 
-  for (uint u=0;u<ql.count();u++)
+  for (const auto &n : ql)
   {
     Argument arg;
-    arg.name=ql[u];
+    arg.name=n;
     if (s3)
     {
       arg.type=s3;
diff --git a/src/vhdljjparser.h b/src/vhdljjparser.h
index 249842e..01316a7 100755
--- a/src/vhdljjparser.h
+++ b/src/vhdljjparser.h
@@ -4,7 +4,6 @@
 #include <vector>
 #include <memory>
 #include <string>
-#include <qcstringlist.h>
 
 #include "parserintf.h"
 #include <stdio.h>
@@ -16,6 +15,7 @@
 #include "entry.h"
 #include "vhdldocgen.h"
 #include "config.h"
+#include "util.h"
 
 enum  { GEN_SEC=0x1, PARAM_SEC,CONTEXT_SEC,PROTECTED_SEC } ;
 //void  parserVhdlfile(const char* inputBuffer);
diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt
index b610f5c..b39ba76 100644
--- a/vhdlparser/CMakeLists.txt
+++ b/vhdlparser/CMakeLists.txt
@@ -32,11 +32,15 @@ endif()
 add_custom_command(
     COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/vhdlparser/vhdl_adj.py ${PROJECT_SOURCE_DIR}/vhdlparser/VhdlParser.cc ${GENERATED_SRC}/VhdlParser_adj.cc
     DEPENDS ${PROJECT_SOURCE_DIR}/vhdlparser/VhdlParser.cc ${PROJECT_SOURCE_DIR}/vhdlparser/vhdl_adj.py
-    OUTPUT  ${GENERATED_SRC}/VhdlParser_adj.cc 
+    OUTPUT  ${GENERATED_SRC}/VhdlParser_adj.cc
 )
 set_source_files_properties(${GENERATED_SRC}/VhdlParser_adj.cc PROPERTIES GENERATED 1)
 
-include_directories(${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/qtools ${PROJECT_SOURCE_DIR}/vhdlparser ${GENERATED_SRC})
+include_directories(
+	${PROJECT_SOURCE_DIR}/src
+	#${PROJECT_SOURCE_DIR}/qtools
+	${PROJECT_SOURCE_DIR}/vhdlparser
+	${GENERATED_SRC})
 add_library(vhdlparser STATIC
 CharStream.cc
 ParseException.cc
diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc
index e039b33..0a57c6f 100644
--- a/vhdlparser/VhdlParser.cc
+++ b/vhdlparser/VhdlParser.cc
@@ -2602,16 +2602,20 @@ QCString VhdlParser::element_declaration() {QCString rec_name,s1,s2;
     if (!hasError) {
     jj_consume_token(SEMI_T);
     }
-QCString name;
-   QCStringList ql=QCStringList::split(",",rec_name);
-   for (uint j=0;j<ql.count();j++)
-   {
-    name=ql[j]+"~";
-    name+=outlineParser()->getNameID().data();;
-    outlineParser()->addVhdlType(name.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s1.data(),Public);
-   }
-   s2=rec_name+":"+s1;
-   return s2;
+auto ql = split(rec_name.str(),",");
+    for (const auto &n : ql)
+    {
+      std::string name=n+"~";
+      name+=outlineParser()->getNameID().data();
+      outlineParser()->addVhdlType(
+          name.c_str(),outlineParser()->getLine(),
+          Entry::VARIABLE_SEC,
+          VhdlDocGen::RECORD,0,
+          s1.data(),
+          Public);
+    }
+    s2=rec_name+":"+s1;
+    return s2;
 assert(false);
 }
 
@@ -9204,14 +9208,22 @@ s+=",";s+=s1;
     if (!hasError) {
     jj_consume_token(SEMI_T);
     }
-QCStringList ql1=QCStringList::split(",",s);
-                   for (uint j=0;j<ql1.count();j++)
+auto ql1=split(s.str(),",");
+                   for (const auto &name : ql1)
                    {
-                     QCStringList ql=QCStringList::split(".",ql1[j]);
-                     QCString it=ql[1];
-                     if ( m_sharedState->parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) )
+                     auto ql2=split(name,".");
+                     if (ql2.size()>1)
                      {
-                       outlineParser()->addVhdlType(it.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::USE,it.data(),"_use_",Public);
+                       std::string it=ql2[1];
+                       if ( m_sharedState->parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) )
+                       {
+                         outlineParser()->addVhdlType(it.c_str(),
+                                                      outlineParser()->getLine(),
+                                                      Entry::VARIABLE_SEC,
+                                                      VhdlDocGen::USE,
+                                                      it.c_str(),
+                                                      "_use_",Public);
+                       }
                      }
                    }
                    s1="use "+s;
diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h
index 891b085..4eea915 100644
--- a/vhdlparser/VhdlParser.h
+++ b/vhdlparser/VhdlParser.h
@@ -1303,14 +1303,6 @@ void parseInline();
  { jj_save(124, xla); }
   }
 
- inline bool jj_3R_207()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_61()) return true;
-    return false;
-  }
-
  inline bool jj_3R_461()
  {
     if (jj_done) return true;
@@ -1407,16 +1399,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_97()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(FILE_T)) return true;
-    if (jj_3R_205()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_89()) return true;
-    return false;
-  }
-
  inline bool jj_3R_693()
  {
     if (jj_done) return true;
@@ -1424,17 +1406,20 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_414()
+ inline bool jj_3R_97()
  {
     if (jj_done) return true;
-    if (jj_3R_513()) return true;
+    if (jj_scan_token(FILE_T)) return true;
+    if (jj_3R_205()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_89()) return true;
     return false;
   }
 
- inline bool jj_3_46()
+ inline bool jj_3R_414()
  {
     if (jj_done) return true;
-    if (jj_3R_98()) return true;
+    if (jj_3R_513()) return true;
     return false;
   }
 
@@ -1450,6 +1435,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_46()
+ {
+    if (jj_done) return true;
+    if (jj_3R_98()) return true;
+    return false;
+  }
+
  inline bool jj_3R_572()
  {
     if (jj_done) return true;
@@ -1629,56 +1621,56 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_628()
+ inline bool jj_3R_535()
  {
     if (jj_done) return true;
-    if (jj_3R_61()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_327()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_627()
+ inline bool jj_3_125()
  {
     if (jj_done) return true;
-    if (jj_3R_72()) return true;
+    if (jj_3R_61()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_577()
+ inline bool jj_3R_442()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_627()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_628()) return true;
+    if (jj_scan_token(77)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_535()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_535()
+ inline bool jj_3R_628()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_327()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
- inline bool jj_3_125()
+ inline bool jj_3R_627()
  {
     if (jj_done) return true;
-    if (jj_3R_61()) return true;
-    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_72()) return true;
     return false;
   }
 
- inline bool jj_3R_442()
+ inline bool jj_3R_577()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(77)) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_535()) jj_scanpos = xsp;
+    if (!jj_3R_627()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_628()) return true;
     return false;
   }
 
@@ -1696,15 +1688,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_547()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(TYPE_T)) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_401()
  {
     if (jj_done) return true;
@@ -1719,19 +1702,20 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_546()
+ inline bool jj_3R_547()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_466()) return true;
+    if (jj_scan_token(TYPE_T)) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_630()
+ inline bool jj_3R_546()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_268()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_466()) return true;
     return false;
   }
 
@@ -1761,16 +1745,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_629()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(ELSIF_T)) return true;
-    if (jj_3R_83()) return true;
-    if (jj_scan_token(THEN_T)) return true;
-    if (jj_3R_268()) return true;
-    return false;
-  }
-
  inline bool jj_3R_361()
  {
     if (jj_done) return true;
@@ -1787,11 +1761,21 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_362()
+ inline bool jj_3R_630()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_63()) return true;
+    if (jj_scan_token(ELSE_T)) return true;
+    if (jj_3R_268()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_629()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(ELSIF_T)) return true;
+    if (jj_3R_83()) return true;
+    if (jj_scan_token(THEN_T)) return true;
+    if (jj_3R_268()) return true;
     return false;
   }
 
@@ -1804,6 +1788,39 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_362()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_63()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_203()
+ {
+    if (jj_done) return true;
+    if (jj_3R_361()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_202()
+ {
+    if (jj_done) return true;
+    if (jj_3R_360()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_94()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_202()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_203()) return true;
+    return false;
+  }
+
  inline bool jj_3R_264()
  {
     if (jj_done) return true;
@@ -1836,28 +1853,26 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_203()
- {
-    if (jj_done) return true;
-    if (jj_3R_361()) return true;
-    return false;
-  }
-
- inline bool jj_3R_202()
+ inline bool jj_3R_493()
  {
     if (jj_done) return true;
-    if (jj_3R_360()) return true;
+    if (jj_scan_token(ELSE_T)) return true;
+    if (jj_3R_61()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_561()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_94()
+ inline bool jj_3R_400()
  {
     if (jj_done) return true;
     Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_202()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_203()) return true;
+    if (jj_3R_493()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_493()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -1873,14 +1888,14 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_493()
+ inline bool jj_3R_399()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_61()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_561()) jj_scanpos = xsp;
+    if (!jj_scan_token(53)) return false;
+    jj_scanpos = xsp;
+    if (jj_scan_token(75)) return true;
     return false;
   }
 
@@ -1891,18 +1906,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_400()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    if (jj_3R_493()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_493()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
  inline bool jj_3R_170()
  {
     if (jj_done) return true;
@@ -1929,17 +1932,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_399()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_scan_token(53)) return false;
-    jj_scanpos = xsp;
-    if (jj_scan_token(75)) return true;
-    return false;
-  }
-
  inline bool jj_3R_466()
  {
     if (jj_done) return true;
@@ -1962,19 +1954,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_68()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(GROUP_T)) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_491()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_317()
  {
     if (jj_done) return true;
@@ -1993,15 +1972,14 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_398()
+ inline bool jj_3R_68()
  {
     if (jj_done) return true;
     if (jj_scan_token(GROUP_T)) return true;
     if (jj_3R_74()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_74()) return true;
+    if (jj_scan_token(IS_T)) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_492()) return true;
+    if (jj_3R_491()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
@@ -2025,22 +2003,24 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_492()
+ inline bool jj_3_124()
  {
     if (jj_done) return true;
-    if (jj_3R_559()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_560()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_114()) return true;
     return false;
   }
 
- inline bool jj_3_124()
+ inline bool jj_3R_398()
  {
     if (jj_done) return true;
-    if (jj_3R_114()) return true;
+    if (jj_scan_token(GROUP_T)) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_492()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
@@ -2061,31 +2041,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_620()
- {
-    if (jj_done) return true;
-    if (jj_3R_369()) return true;
-    return false;
-  }
-
- inline bool jj_3R_619()
- {
-    if (jj_done) return true;
-    if (jj_3R_63()) return true;
-    return false;
-  }
-
- inline bool jj_3R_559()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_619()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_620()) return true;
-    return false;
-  }
-
  inline bool jj_3R_687()
  {
     if (jj_done) return true;
@@ -2093,14 +2048,15 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_73()
+ inline bool jj_3R_492()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GENERIC_T)) return true;
-    if (jj_scan_token(MAP_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_169()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_559()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_560()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -2130,6 +2086,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_620()
+ {
+    if (jj_done) return true;
+    if (jj_3R_369()) return true;
+    return false;
+  }
+
  inline bool jj_3R_587()
  {
     if (jj_done) return true;
@@ -2145,33 +2108,47 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_542()
+ inline bool jj_3R_619()
+ {
+    if (jj_done) return true;
+    if (jj_3R_63()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_559()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WITH_T)) return true;
-    if (jj_3R_61()) return true;
-    if (jj_scan_token(SELECT_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(155)) jj_scanpos = xsp;
-    if (jj_3R_663()) return true;
-    if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_317()) return true;
+    if (!jj_3R_619()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_620()) return true;
     return false;
   }
 
- inline bool jj_3R_162()
+ inline bool jj_3R_73()
  {
     if (jj_done) return true;
-    if (jj_3R_327()) return true;
+    if (jj_scan_token(GENERIC_T)) return true;
+    if (jj_scan_token(MAP_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_169()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3_39()
+ inline bool jj_3R_542()
  {
     if (jj_done) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_scan_token(WITH_T)) return true;
+    if (jj_3R_61()) return true;
+    if (jj_scan_token(SELECT_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(155)) jj_scanpos = xsp;
+    if (jj_3R_663()) return true;
+    if (jj_scan_token(VARASSIGN_T)) return true;
+    if (jj_3R_317()) return true;
     return false;
   }
 
@@ -2205,17 +2182,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_69()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(GENERIC_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_162()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_280()
  {
     if (jj_done) return true;
@@ -2241,28 +2207,29 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_336()
+ inline bool jj_3R_162()
  {
     if (jj_done) return true;
-    if (jj_scan_token(IF_T)) return true;
+    if (jj_3R_327()) return true;
     return false;
   }
 
- inline bool jj_3R_174()
+ inline bool jj_3_39()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_335()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_336()) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_335()
+ inline bool jj_3R_69()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FOR_T)) return true;
+    if (jj_scan_token(GENERIC_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_162()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
@@ -2290,40 +2257,46 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_545()
+ inline bool jj_3R_336()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(IF_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_174()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_61()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_587()) jj_scanpos = xsp;
+    if (!jj_3R_335()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_336()) return true;
     return false;
   }
 
- inline bool jj_3R_78()
+ inline bool jj_3R_335()
  {
     if (jj_done) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_174()) return true;
+    if (jj_scan_token(FOR_T)) return true;
     return false;
   }
 
- inline bool jj_3_122()
+ inline bool jj_3R_545()
  {
     if (jj_done) return true;
-    if (jj_3R_149()) return true;
+    if (jj_scan_token(ELSE_T)) return true;
+    if (jj_3R_61()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_587()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_110()
+ inline bool jj_3_122()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_236()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_149()) return true;
     return false;
   }
 
@@ -2344,6 +2317,15 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_78()
+ {
+    if (jj_done) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_174()) return true;
+    return false;
+  }
+
  inline bool jj_3R_278()
  {
     if (jj_done) return true;
@@ -2369,18 +2351,21 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_570()
+ inline bool jj_3R_110()
  {
     if (jj_done) return true;
-    if (jj_scan_token(AT_T)) return true;
     if (jj_3R_63()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_236()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_481()
+ inline bool jj_3R_570()
  {
     if (jj_done) return true;
-    if (jj_3R_549()) return true;
+    if (jj_scan_token(AT_T)) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
@@ -2413,26 +2398,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_624()
- {
-    if (jj_done) return true;
-    if (jj_3R_147()) return true;
-    return false;
-  }
-
- inline bool jj_3R_592()
+ inline bool jj_3R_481()
  {
     if (jj_done) return true;
-    if (jj_3R_399()) return true;
+    if (jj_3R_549()) return true;
     return false;
   }
 
- inline bool jj_3R_160()
+ inline bool jj_3R_624()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_326()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_147()) return true;
     return false;
   }
 
@@ -2446,17 +2422,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_142()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(TYPE_T)) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_588()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_647()
  {
     if (jj_done) return true;
@@ -2477,46 +2442,49 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_66()
+ inline bool jj_3R_592()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_160()) jj_scanpos = xsp;
+    if (jj_3R_399()) return true;
     return false;
   }
 
- inline bool jj_3_119()
+ inline bool jj_3R_160()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_147()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_326()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_569()
+ inline bool jj_3_119()
  {
     if (jj_done) return true;
-    if (jj_3R_623()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_624()) jj_scanpos = xsp;
-    if (jj_3R_74()) return true;
+    if (jj_scan_token(DOT_T)) return true;
+    if (jj_3R_147()) return true;
     return false;
   }
 
- inline bool jj_3R_582()
+ inline bool jj_3R_142()
  {
     if (jj_done) return true;
-    if (jj_3R_327()) return true;
+    if (jj_scan_token(TYPE_T)) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_588()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_413()
+ inline bool jj_3R_569()
  {
     if (jj_done) return true;
-    if (jj_scan_token(INTEGER)) return true;
+    if (jj_3R_623()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_624()) jj_scanpos = xsp;
+    if (jj_3R_74()) return true;
     return false;
   }
 
@@ -2528,21 +2496,13 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_326()
+ inline bool jj_3R_66()
  {
     if (jj_done) return true;
+    if (jj_3R_63()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_412()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_413()) return true;
-    return false;
-  }
-
- inline bool jj_3R_412()
- {
-    if (jj_done) return true;
-    if (jj_3R_63()) return true;
+    if (jj_3R_160()) jj_scanpos = xsp;
     return false;
   }
 
@@ -2566,6 +2526,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_582()
+ {
+    if (jj_done) return true;
+    if (jj_3R_327()) return true;
+    return false;
+  }
+
  inline bool jj_3R_512()
  {
     if (jj_done) return true;
@@ -2580,6 +2547,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_413()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(INTEGER)) return true;
+    return false;
+  }
+
  inline bool jj_3R_411()
  {
     if (jj_done) return true;
@@ -2600,41 +2574,42 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_189()
+ inline bool jj_3R_326()
  {
     if (jj_done) return true;
-    if (jj_3R_74()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_412()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_413()) return true;
     return false;
   }
 
- inline bool jj_3R_509()
+ inline bool jj_3R_412()
  {
     if (jj_done) return true;
-    if (jj_scan_token(VARIABLE_T)) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
- inline bool jj_3R_659()
+ inline bool jj_3R_189()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FILE_T)) return true;
-    if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_161()) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
- inline bool jj_3R_508()
+ inline bool jj_3R_509()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SIGNAL_T)) return true;
+    if (jj_scan_token(VARIABLE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_591()
+ inline bool jj_3R_508()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OPEN_T)) return true;
-    if (jj_3R_61()) return true;
+    if (jj_scan_token(SIGNAL_T)) return true;
     return false;
   }
 
@@ -2658,22 +2633,19 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_549()
+ inline bool jj_3R_659()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_591()) jj_scanpos = xsp;
-    if (jj_scan_token(IS_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_592()) jj_scanpos = xsp;
-    if (jj_3R_593()) return true;
+    if (jj_scan_token(FILE_T)) return true;
+    if (jj_scan_token(OF_T)) return true;
+    if (jj_3R_161()) return true;
     return false;
   }
 
- inline bool jj_3R_593()
+ inline bool jj_3R_591()
  {
     if (jj_done) return true;
+    if (jj_scan_token(OPEN_T)) return true;
     if (jj_3R_61()) return true;
     return false;
   }
@@ -2693,6 +2665,19 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_549()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_591()) jj_scanpos = xsp;
+    if (jj_scan_token(IS_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_592()) jj_scanpos = xsp;
+    if (jj_3R_593()) return true;
+    return false;
+  }
+
  inline bool jj_3R_323()
  {
     if (jj_done) return true;
@@ -2713,6 +2698,27 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_593()
+ {
+    if (jj_done) return true;
+    if (jj_3R_61()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_284()
+ {
+    if (jj_done) return true;
+    if (jj_3R_137()) return true;
+    return false;
+  }
+
+ inline bool jj_3_116()
+ {
+    if (jj_done) return true;
+    if (jj_3R_146()) return true;
+    return false;
+  }
+
  inline bool jj_3R_467()
  {
     if (jj_done) return true;
@@ -2735,13 +2741,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_284()
- {
-    if (jj_done) return true;
-    if (jj_3R_137()) return true;
-    return false;
-  }
-
  inline bool jj_3R_273()
  {
     if (jj_done) return true;
@@ -2749,13 +2748,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_116()
- {
-    if (jj_done) return true;
-    if (jj_3R_146()) return true;
-    return false;
-  }
-
  inline bool jj_3R_295()
  {
     if (jj_done) return true;
@@ -2788,6 +2780,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_296()
+ {
+    if (jj_done) return true;
+    if (jj_3R_74()) return true;
+    return false;
+  }
+
  inline bool jj_3R_141()
  {
     if (jj_done) return true;
@@ -2815,6 +2814,21 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_246()
+ {
+    if (jj_done) return true;
+    if (jj_3R_137()) return true;
+    return false;
+  }
+
+ inline bool jj_3_115()
+ {
+    if (jj_done) return true;
+    if (jj_3R_145()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_251()
  {
     if (jj_done) return true;
@@ -2831,53 +2845,56 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_296()
+ inline bool jj_3R_409()
  {
     if (jj_done) return true;
-    if (jj_3R_74()) return true;
+    if (jj_scan_token(OR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_409()
+ inline bool jj_3R_144()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OR_T)) return true;
+    if (jj_scan_token(END_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_296()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_408()
+ inline bool jj_3R_648()
  {
     if (jj_done) return true;
-    if (jj_scan_token(XOR_T)) return true;
+    if (jj_3R_137()) return true;
     return false;
   }
 
- inline bool jj_3R_407()
+ inline bool jj_3R_408()
  {
     if (jj_done) return true;
-    if (jj_scan_token(XNOR_T)) return true;
+    if (jj_scan_token(XOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_246()
+ inline bool jj_3R_188()
  {
     if (jj_done) return true;
-    if (jj_3R_137()) return true;
+    if (jj_3R_349()) return true;
     return false;
   }
 
- inline bool jj_3R_406()
+ inline bool jj_3R_407()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NOR_T)) return true;
+    if (jj_scan_token(XNOR_T)) return true;
     return false;
   }
 
- inline bool jj_3_115()
+ inline bool jj_3R_406()
  {
     if (jj_done) return true;
-    if (jj_3R_145()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_scan_token(NOR_T)) return true;
     return false;
   }
 
@@ -2914,31 +2931,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_144()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(END_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_296()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_648()
- {
-    if (jj_done) return true;
-    if (jj_3R_137()) return true;
-    return false;
-  }
-
- inline bool jj_3R_188()
- {
-    if (jj_done) return true;
-    if (jj_3R_349()) return true;
-    return false;
-  }
-
  inline bool jj_3R_61()
  {
     if (jj_done) return true;
@@ -2967,6 +2959,16 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_136()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(GENERIC_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_327()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_129()
  {
     if (jj_done) return true;
@@ -2996,12 +2998,13 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_136()
+ inline bool jj_3R_137()
  {
     if (jj_done) return true;
     if (jj_scan_token(GENERIC_T)) return true;
+    if (jj_scan_token(MAP_T)) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_327()) return true;
+    if (jj_3R_169()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
@@ -3031,21 +3034,26 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_137()
+ inline bool jj_3R_685()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GENERIC_T)) return true;
-    if (jj_scan_token(MAP_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_169()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_369()) return true;
     return false;
   }
 
- inline bool jj_3R_685()
+ inline bool jj_3R_135()
  {
     if (jj_done) return true;
-    if (jj_3R_369()) return true;
+    if (jj_scan_token(FUNCTION_T)) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_scan_token(NEW_T)) return true;
+    if (jj_3R_63()) return true;
+    if (jj_3R_245()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_284()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
@@ -3089,22 +3097,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_135()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(FUNCTION_T)) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_63()) return true;
-    if (jj_3R_245()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_284()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_95()
  {
     if (jj_done) return true;
@@ -3127,22 +3119,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_488()
- {
-    if (jj_done) return true;
-    if (jj_3R_554()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_555()) return true;
-    return false;
-  }
-
- inline bool jj_3R_662()
- {
-    if (jj_done) return true;
-    if (jj_3R_245()) return true;
-    return false;
-  }
-
  inline bool jj_3R_91()
  {
     if (jj_done) return true;
@@ -3166,13 +3142,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_597()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(ALL_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_437()
  {
     if (jj_done) return true;
@@ -3180,10 +3149,12 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_596()
+ inline bool jj_3R_488()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OTHER_T)) return true;
+    if (jj_3R_554()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_555()) return true;
     return false;
   }
 
@@ -3207,6 +3178,27 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_662()
+ {
+    if (jj_done) return true;
+    if (jj_3R_245()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_597()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(ALL_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_596()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(OTHER_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_595()
  {
     if (jj_done) return true;
@@ -3259,16 +3251,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_644()
- {
-    if (jj_done) return true;
-    if (jj_3R_661()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_662()) jj_scanpos = xsp;
-    return false;
-  }
-
  inline bool jj_3R_263()
  {
     if (jj_done) return true;
@@ -3290,6 +3272,16 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_644()
+ {
+    if (jj_done) return true;
+    if (jj_3R_661()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_662()) jj_scanpos = xsp;
+    return false;
+  }
+
  inline bool jj_3R_692()
  {
     if (jj_done) return true;
@@ -3309,66 +3301,66 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_36()
+ inline bool jj_3R_720()
  {
     if (jj_done) return true;
-    if (jj_3R_91()) return true;
+    if (jj_3R_347()) return true;
     return false;
   }
 
- inline bool jj_3_34()
+ inline bool jj_3R_719()
  {
     if (jj_done) return true;
-    if (jj_3R_67()) return true;
+    if (jj_3R_395()) return true;
     return false;
   }
 
- inline bool jj_3R_720()
+ inline bool jj_3R_718()
  {
     if (jj_done) return true;
-    if (jj_3R_347()) return true;
+    if (jj_3R_364()) return true;
     return false;
   }
 
- inline bool jj_3R_719()
+ inline bool jj_3R_700()
  {
     if (jj_done) return true;
-    if (jj_3R_395()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_718()) return false;
+    jj_scanpos = xsp;
+    if (!jj_3R_719()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_720()) return true;
     return false;
   }
 
- inline bool jj_3_35()
+ inline bool jj_3_36()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_91()) return true;
     return false;
   }
 
- inline bool jj_3R_558()
+ inline bool jj_3_34()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_557()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
- inline bool jj_3R_718()
+ inline bool jj_3_35()
  {
     if (jj_done) return true;
-    if (jj_3R_364()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_700()
+ inline bool jj_3R_558()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_718()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_719()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_720()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_557()) return true;
     return false;
   }
 
@@ -3431,13 +3423,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_618()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(BOX_T)) return true;
-    return false;
-  }
-
  inline bool jj_3_113()
  {
     if (jj_done) return true;
@@ -3466,25 +3451,24 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_366()
+ inline bool jj_3R_713()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ENTITY_T)) return true;
-    if (jj_3R_74()) return true;
+    if (jj_3R_393()) return true;
     return false;
   }
 
- inline bool jj_3R_713()
+ inline bool jj_3R_712()
  {
     if (jj_done) return true;
-    if (jj_3R_393()) return true;
+    if (jj_3R_392()) return true;
     return false;
   }
 
- inline bool jj_3R_712()
+ inline bool jj_3R_618()
  {
     if (jj_done) return true;
-    if (jj_3R_392()) return true;
+    if (jj_scan_token(BOX_T)) return true;
     return false;
   }
 
@@ -3523,15 +3507,11 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_491()
+ inline bool jj_3R_366()
  {
     if (jj_done) return true;
-    if (jj_3R_557()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_558()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(ENTITY_T)) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
@@ -3582,6 +3562,41 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_491()
+ {
+    if (jj_done) return true;
+    if (jj_3R_557()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_558()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+ inline bool jj_3R_544()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(AFTER_T)) return true;
+    if (jj_3R_61()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_143()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(PROTECTED_T)) return true;
+    if (jj_scan_token(BODY_T)) return true;
+    if (jj_3R_680()) return true;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(PROTECTED_T)) return true;
+    if (jj_scan_token(BODY_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_681()) jj_scanpos = xsp;
+    return false;
+  }
+
  inline bool jj_3R_557()
  {
     if (jj_done) return true;
@@ -3592,6 +3607,14 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_519()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_463()) return true;
+    return false;
+  }
+
  inline bool jj_3R_626()
  {
     if (jj_done) return true;
@@ -3608,14 +3631,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_544()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(AFTER_T)) return true;
-    if (jj_3R_61()) return true;
-    return false;
-  }
-
  inline bool jj_3R_613()
  {
     if (jj_done) return true;
@@ -3637,21 +3652,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_143()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(PROTECTED_T)) return true;
-    if (jj_scan_token(BODY_T)) return true;
-    if (jj_3R_680()) return true;
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(PROTECTED_T)) return true;
-    if (jj_scan_token(BODY_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_681()) jj_scanpos = xsp;
-    return false;
-  }
-
  inline bool jj_3R_610()
  {
     if (jj_done) return true;
@@ -3659,14 +3659,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_519()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_463()) return true;
-    return false;
-  }
-
  inline bool jj_3R_609()
  {
     if (jj_done) return true;
@@ -3702,6 +3694,16 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_463()
+ {
+    if (jj_done) return true;
+    if (jj_3R_61()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_544()) jj_scanpos = xsp;
+    return false;
+  }
+
  inline bool jj_3R_604()
  {
     if (jj_done) return true;
@@ -3744,13 +3746,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_463()
+ inline bool jj_3R_422()
  {
     if (jj_done) return true;
-    if (jj_3R_61()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_544()) jj_scanpos = xsp;
+    if (jj_scan_token(UNAFFECTED_T)) return true;
     return false;
   }
 
@@ -3802,25 +3801,41 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_576()
+ inline bool jj_3R_332()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OPEN_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_421()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_422()) return true;
     return false;
   }
 
- inline bool jj_3R_575()
+ inline bool jj_3R_421()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONFIGURATION_T)) return true;
-    if (jj_3R_63()) return true;
+    if (jj_3R_463()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_519()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_422()
+ inline bool jj_3R_576()
  {
     if (jj_done) return true;
-    if (jj_scan_token(UNAFFECTED_T)) return true;
+    if (jj_scan_token(OPEN_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_575()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(CONFIGURATION_T)) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
@@ -3848,29 +3863,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_332()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_421()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_422()) return true;
-    return false;
-  }
-
- inline bool jj_3R_421()
- {
-    if (jj_done) return true;
-    if (jj_3R_463()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_519()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
  inline bool jj_3R_260()
  {
     if (jj_done) return true;
@@ -3896,14 +3888,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_33()
- {
-    if (jj_done) return true;
-    if (jj_3R_90()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_705()
  {
     if (jj_done) return true;
@@ -3914,10 +3898,11 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_32()
+ inline bool jj_3_33()
  {
     if (jj_done) return true;
-    if (jj_3R_89()) return true;
+    if (jj_3R_90()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
     return false;
   }
 
@@ -3929,6 +3914,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_32()
+ {
+    if (jj_done) return true;
+    if (jj_3R_89()) return true;
+    return false;
+  }
+
  inline bool jj_3_31()
  {
     if (jj_done) return true;
@@ -3936,6 +3928,14 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_480()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(VARASSIGN_T)) return true;
+    if (jj_3R_61()) return true;
+    return false;
+  }
+
  inline bool jj_3R_376()
  {
     if (jj_done) return true;
@@ -3954,6 +3954,22 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_391()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(101)) jj_scanpos = xsp;
+    if (jj_scan_token(VARIABLE_T)) return true;
+    if (jj_3R_205()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_89()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_480()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_168()
  {
     if (jj_done) return true;
@@ -3961,6 +3977,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_458()
+ {
+    if (jj_done) return true;
+    if (jj_3R_542()) return true;
+    return false;
+  }
+
  inline bool jj_3R_167()
  {
     if (jj_done) return true;
@@ -3979,35 +4002,34 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_480()
+ inline bool jj_3_111()
  {
     if (jj_done) return true;
-    if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_61()) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3R_489()
+ inline bool jj_3R_378()
  {
     if (jj_done) return true;
-    if (jj_3R_556()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_63()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_457()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_458()) return true;
     return false;
   }
 
- inline bool jj_3R_391()
+ inline bool jj_3R_457()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(101)) jj_scanpos = xsp;
-    if (jj_scan_token(VARIABLE_T)) return true;
-    if (jj_3R_205()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_89()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_480()) jj_scanpos = xsp;
+    if (jj_3_111()) jj_scanpos = xsp;
+    if (jj_3R_119()) return true;
+    if (jj_scan_token(VARASSIGN_T)) return true;
+    if (jj_3R_61()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -4020,10 +4042,12 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_458()
+ inline bool jj_3R_489()
  {
     if (jj_done) return true;
-    if (jj_3R_542()) return true;
+    if (jj_3R_556()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
@@ -4038,14 +4062,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_111()
- {
-    if (jj_done) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_166()
  {
     if (jj_done) return true;
@@ -4053,30 +4069,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_378()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_457()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_458()) return true;
-    return false;
-  }
-
- inline bool jj_3R_457()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3_111()) jj_scanpos = xsp;
-    if (jj_3R_119()) return true;
-    if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_61()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_477()
  {
     if (jj_done) return true;
@@ -4142,18 +4134,35 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_573()
+ inline bool jj_3_106()
  {
     if (jj_done) return true;
-    if (jj_scan_token(REJECT_T)) return true;
-    if (jj_3R_61()) return true;
+    if (jj_3R_139()) return true;
     return false;
   }
 
- inline bool jj_3_106()
+ inline bool jj_3R_704()
  {
     if (jj_done) return true;
-    if (jj_3R_139()) return true;
+    if (jj_scan_token(ARRAY_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_722()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_723()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(OF_T)) return true;
+    if (jj_3R_89()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_573()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(REJECT_T)) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
@@ -4167,20 +4176,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_704()
+ inline bool jj_3R_161()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ARRAY_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_722()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_723()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RPAREN_T)) return true;
-    if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_89()) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
@@ -4209,10 +4208,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_161()
+ inline bool jj_3R_193()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
+    if (jj_3R_139()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_643()
+ {
+    if (jj_done) return true;
+    if (jj_3R_660()) return true;
     return false;
   }
 
@@ -4223,52 +4229,52 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_193()
+ inline bool jj_3_110()
  {
     if (jj_done) return true;
-    if (jj_3R_139()) return true;
+    if (jj_3R_143()) return true;
     return false;
   }
 
- inline bool jj_3R_643()
+ inline bool jj_3R_642()
  {
     if (jj_done) return true;
-    if (jj_3R_660()) return true;
+    if (jj_3R_659()) return true;
     return false;
   }
 
- inline bool jj_3R_187()
+ inline bool jj_3R_641()
  {
     if (jj_done) return true;
-    if (jj_3R_348()) return true;
+    if (jj_3R_658()) return true;
     return false;
   }
 
- inline bool jj_3_28()
+ inline bool jj_3R_640()
  {
     if (jj_done) return true;
-    if (jj_3R_86()) return true;
+    if (jj_3R_657()) return true;
     return false;
   }
 
- inline bool jj_3R_186()
+ inline bool jj_3R_187()
  {
     if (jj_done) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_348()) return true;
     return false;
   }
 
- inline bool jj_3_110()
+ inline bool jj_3_28()
  {
     if (jj_done) return true;
-    if (jj_3R_143()) return true;
+    if (jj_3R_86()) return true;
     return false;
   }
 
- inline bool jj_3R_642()
+ inline bool jj_3R_186()
  {
     if (jj_done) return true;
-    if (jj_3R_659()) return true;
+    if (jj_3R_87()) return true;
     return false;
   }
 
@@ -4279,17 +4285,29 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_641()
+ inline bool jj_3R_639()
  {
     if (jj_done) return true;
-    if (jj_3R_658()) return true;
+    if (jj_3R_656()) return true;
     return false;
   }
 
- inline bool jj_3R_640()
+ inline bool jj_3R_588()
  {
     if (jj_done) return true;
-    if (jj_3R_657()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_639()) return false;
+    jj_scanpos = xsp;
+    if (!jj_3R_640()) return false;
+    jj_scanpos = xsp;
+    if (!jj_3R_641()) return false;
+    jj_scanpos = xsp;
+    if (!jj_3R_642()) return false;
+    jj_scanpos = xsp;
+    if (!jj_3_110()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_643()) return true;
     return false;
   }
 
@@ -4315,36 +4333,24 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_639()
+ inline bool jj_3R_192()
  {
     if (jj_done) return true;
-    if (jj_3R_656()) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
- inline bool jj_3R_588()
+ inline bool jj_3R_286()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_639()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_640()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_641()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_642()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3_110()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_643()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_286()
+ inline bool jj_3R_476()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_547()) return true;
     return false;
   }
 
@@ -4366,20 +4372,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_192()
- {
-    if (jj_done) return true;
-    if (jj_3R_63()) return true;
-    return false;
-  }
-
- inline bool jj_3R_476()
- {
-    if (jj_done) return true;
-    if (jj_3R_547()) return true;
-    return false;
-  }
-
  inline bool jj_3_109()
  {
     if (jj_done) return true;
@@ -4398,13 +4390,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_27()
- {
-    if (jj_done) return true;
-    if (jj_3R_85()) return true;
-    return false;
-  }
-
  inline bool jj_3R_111()
  {
     if (jj_done) return true;
@@ -4423,13 +4408,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_703()
+ inline bool jj_3_27()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ARRAY_T)) return true;
-    if (jj_3R_65()) return true;
-    if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_89()) return true;
+    if (jj_3R_85()) return true;
     return false;
   }
 
@@ -4441,6 +4423,16 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_703()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(ARRAY_T)) return true;
+    if (jj_3R_65()) return true;
+    if (jj_scan_token(OF_T)) return true;
+    if (jj_3R_89()) return true;
+    return false;
+  }
+
  inline bool jj_3R_134()
  {
     if (jj_done) return true;
@@ -4453,20 +4445,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_389()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(CONSTANT_T)) return true;
-    if (jj_3R_205()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_89()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_477()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_256()
  {
     if (jj_done) return true;
@@ -4499,10 +4477,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_26()
+ inline bool jj_3R_389()
  {
     if (jj_done) return true;
-    if (jj_3R_84()) return true;
+    if (jj_scan_token(CONSTANT_T)) return true;
+    if (jj_3R_205()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_89()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_477()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
@@ -4513,20 +4498,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_396()
+ inline bool jj_3R_227()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_181()) return true;
-    if (jj_3R_344()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_321()) return true;
     return false;
   }
 
- inline bool jj_3R_227()
+ inline bool jj_3_26()
  {
     if (jj_done) return true;
-    if (jj_3R_321()) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
@@ -4537,10 +4519,13 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_579()
+ inline bool jj_3R_396()
  {
     if (jj_done) return true;
-    if (jj_3R_345()) return true;
+    if (jj_scan_token(FOR_T)) return true;
+    if (jj_3R_181()) return true;
+    if (jj_3R_344()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
@@ -4566,21 +4551,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_578()
- {
-    if (jj_done) return true;
-    if (jj_3R_84()) return true;
-    return false;
-  }
-
- inline bool jj_3R_523()
+ inline bool jj_3R_579()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_578()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_579()) return true;
+    if (jj_3R_345()) return true;
     return false;
   }
 
@@ -4607,21 +4581,30 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_138()
+ inline bool jj_3R_578()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_61()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3_25()
+ inline bool jj_3R_523()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_83()) return true;
-    if (jj_scan_token(ELSE_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_578()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_579()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_138()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_61()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
@@ -4654,29 +4637,28 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_367()
+ inline bool jj_3_25()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONFIGURATION_T)) return true;
-    if (jj_3R_74()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_83()) return true;
+    if (jj_scan_token(ELSE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_334()
+ inline bool jj_3R_367()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_83()) return true;
+    if (jj_scan_token(CONFIGURATION_T)) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
- inline bool jj_3R_333()
+ inline bool jj_3R_334()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
     if (jj_3R_83()) return true;
-    if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_332()) return true;
     return false;
   }
 
@@ -4689,6 +4671,16 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_333()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_83()) return true;
+    if (jj_scan_token(ELSE_T)) return true;
+    if (jj_3R_332()) return true;
+    return false;
+  }
+
  inline bool jj_3R_173()
  {
     if (jj_done) return true;
@@ -4703,17 +4695,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_75()
- {
-    if (jj_done) return true;
-    if (jj_3R_119()) return true;
-    if (jj_scan_token(LESSTHAN_T)) return true;
-    if (jj_3R_172()) return true;
-    if (jj_3R_173()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_538()
  {
     if (jj_done) return true;
@@ -4725,6 +4706,17 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_75()
+ {
+    if (jj_done) return true;
+    if (jj_3R_119()) return true;
+    if (jj_scan_token(LESSTHAN_T)) return true;
+    if (jj_3R_172()) return true;
+    if (jj_3R_173()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
+    return false;
+  }
+
  inline bool jj_3_104()
  {
     if (jj_done) return true;
@@ -4785,20 +4777,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_23()
- {
-    if (jj_done) return true;
-    if (jj_3R_81()) return true;
-    return false;
-  }
-
- inline bool jj_3_22()
- {
-    if (jj_done) return true;
-    if (jj_3R_80()) return true;
-    return false;
-  }
-
  inline bool jj_3R_364()
  {
     if (jj_done) return true;
@@ -4826,23 +4804,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_79()
+ inline bool jj_3_23()
  {
     if (jj_done) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_81()) return true;
     return false;
   }
 
- inline bool jj_3_21()
+ inline bool jj_3_22()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_79()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(79)) jj_scanpos = xsp;
-    if (jj_scan_token(ASSERT_T)) return true;
+    if (jj_3R_80()) return true;
     return false;
   }
 
@@ -4857,6 +4829,26 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_79()
+ {
+    if (jj_done) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3_21()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_79()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
+    if (jj_scan_token(ASSERT_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_636()
  {
     if (jj_done) return true;
@@ -4883,6 +4875,20 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_101()
+ {
+    if (jj_done) return true;
+    if (jj_3R_67()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_675()
+ {
+    if (jj_done) return true;
+    if (jj_3R_398()) return true;
+    return false;
+  }
+
  inline bool jj_3_19()
  {
     if (jj_done) return true;
@@ -4913,27 +4919,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_101()
- {
-    if (jj_done) return true;
-    if (jj_3R_67()) return true;
-    return false;
-  }
-
- inline bool jj_3R_675()
- {
-    if (jj_done) return true;
-    if (jj_3R_398()) return true;
-    return false;
-  }
-
- inline bool jj_3_20()
- {
-    if (jj_done) return true;
-    if (jj_3R_78()) return true;
-    return false;
-  }
-
  inline bool jj_3R_674()
  {
     if (jj_done) return true;
@@ -4955,6 +4940,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_20()
+ {
+    if (jj_done) return true;
+    if (jj_3R_78()) return true;
+    return false;
+  }
+
  inline bool jj_3R_672()
  {
     if (jj_done) return true;
@@ -4976,13 +4968,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_17()
- {
-    if (jj_done) return true;
-    if (jj_3R_75()) return true;
-    return false;
-  }
-
  inline bool jj_3R_669()
  {
     if (jj_done) return true;
@@ -5018,17 +5003,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_665()
+ inline bool jj_3_17()
  {
     if (jj_done) return true;
-    if (jj_3R_387()) return true;
+    if (jj_3R_75()) return true;
     return false;
   }
 
- inline bool jj_3R_176()
+ inline bool jj_3R_665()
  {
     if (jj_done) return true;
-    if (jj_3R_337()) return true;
+    if (jj_3R_387()) return true;
     return false;
   }
 
@@ -5072,18 +5057,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_175()
- {
-    if (jj_done) return true;
-    if (jj_3R_75()) return true;
-    return false;
-  }
-
- inline bool jj_3_16()
+ inline bool jj_3R_176()
  {
     if (jj_done) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_337()) return true;
     return false;
   }
 
@@ -5095,21 +5072,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_80()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3_16()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(79)) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_175()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_176()) return true;
-    return false;
-  }
-
  inline bool jj_3_100()
  {
     if (jj_done) return true;
@@ -5135,7 +5097,14 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_15()
+ inline bool jj_3R_175()
+ {
+    if (jj_done) return true;
+    if (jj_3R_75()) return true;
+    return false;
+  }
+
+ inline bool jj_3_16()
  {
     if (jj_done) return true;
     if (jj_3R_74()) return true;
@@ -5143,20 +5112,22 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_82()
+ inline bool jj_3R_80()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_15()) jj_scanpos = xsp;
+    if (jj_3_16()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(79)) jj_scanpos = xsp;
-    if (jj_3R_180()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    xsp = jj_scanpos;
+    if (!jj_3R_175()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_176()) return true;
     return false;
   }
 
- inline bool jj_3_14()
+ inline bool jj_3_15()
  {
     if (jj_done) return true;
     if (jj_3R_74()) return true;
@@ -5164,13 +5135,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_13()
- {
-    if (jj_done) return true;
-    if (jj_3R_73()) return true;
-    return false;
-  }
-
  inline bool jj_3R_209()
  {
     if (jj_done) return true;
@@ -5179,15 +5143,15 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_92()
+ inline bool jj_3R_82()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_14()) jj_scanpos = xsp;
+    if (jj_3_15()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(79)) jj_scanpos = xsp;
-    if (jj_3R_196()) return true;
+    if (jj_3R_180()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -5199,6 +5163,21 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_14()
+ {
+    if (jj_done) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3_13()
+ {
+    if (jj_done) return true;
+    if (jj_3R_73()) return true;
+    return false;
+  }
+
  inline bool jj_3R_208()
  {
     if (jj_done) return true;
@@ -5225,6 +5204,19 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_92()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3_14()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
+    if (jj_3R_196()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_679()
  {
     if (jj_done) return true;
@@ -5257,6 +5249,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_478()
+ {
+    if (jj_done) return true;
+    if (jj_3R_548()) return true;
+    return false;
+  }
+
  inline bool jj_3R_178()
  {
     if (jj_done) return true;
@@ -5264,17 +5263,18 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_487()
+ inline bool jj_3R_164()
  {
     if (jj_done) return true;
-    if (jj_3R_74()) return true;
+    if (jj_3R_133()) return true;
+    if (jj_3R_134()) return true;
     return false;
   }
 
- inline bool jj_3R_478()
+ inline bool jj_3R_487()
  {
     if (jj_done) return true;
-    if (jj_3R_548()) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
@@ -5287,14 +5287,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_164()
- {
-    if (jj_done) return true;
-    if (jj_3R_133()) return true;
-    if (jj_3R_134()) return true;
-    return false;
-  }
-
  inline bool jj_3R_540()
  {
     if (jj_done) return true;
@@ -5312,6 +5304,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_373()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(STRINGLITERAL)) return true;
+    return false;
+  }
+
  inline bool jj_3R_81()
  {
     if (jj_done) return true;
@@ -5327,10 +5326,11 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_373()
+ inline bool jj_3R_453()
  {
     if (jj_done) return true;
-    if (jj_scan_token(STRINGLITERAL)) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
@@ -5363,11 +5363,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_453()
+ inline bool jj_3R_163()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_63()) return true;
+    if (jj_3R_328()) return true;
     return false;
   }
 
@@ -5379,6 +5378,20 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_70()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_163()) jj_scanpos = xsp;
+    if (jj_3R_134()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_164()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
  inline bool jj_3R_394()
  {
     if (jj_done) return true;
@@ -5399,24 +5412,19 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_163()
+ inline bool jj_3R_375()
  {
     if (jj_done) return true;
-    if (jj_3R_328()) return true;
+    if (jj_scan_token(RETURN_T)) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
- inline bool jj_3R_70()
+ inline bool jj_3R_646()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_163()) jj_scanpos = xsp;
-    if (jj_3R_134()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_164()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
@@ -5436,22 +5444,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_375()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(RETURN_T)) return true;
-    if (jj_3R_63()) return true;
-    return false;
-  }
-
- inline bool jj_3R_646()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_63()) return true;
-    return false;
-  }
-
  inline bool jj_3R_374()
  {
     if (jj_done) return true;
@@ -5464,25 +5456,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_12()
- {
-    if (jj_done) return true;
-    if (jj_3R_72()) return true;
-    return false;
-  }
-
- inline bool jj_3R_90()
- {
-    if (jj_done) return true;
-    if (jj_3R_194()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_195()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
  inline bool jj_3R_245()
  {
     if (jj_done) return true;
@@ -5496,10 +5469,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_11()
+ inline bool jj_3_12()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_72()) return true;
     return false;
   }
 
@@ -5510,10 +5483,15 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_354()
+ inline bool jj_3R_90()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OTHER_T)) return true;
+    if (jj_3R_194()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_195()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -5524,18 +5502,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_10()
+ inline bool jj_3_11()
  {
     if (jj_done) return true;
     if (jj_3R_70()) return true;
-    if (jj_3R_71()) return true;
-    return false;
-  }
-
- inline bool jj_3R_353()
- {
-    if (jj_done) return true;
-    if (jj_3R_74()) return true;
     return false;
   }
 
@@ -5564,6 +5534,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_354()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(OTHER_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_590()
  {
     if (jj_done) return true;
@@ -5571,10 +5548,18 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_352()
+ inline bool jj_3_10()
  {
     if (jj_done) return true;
-    if (jj_3R_72()) return true;
+    if (jj_3R_70()) return true;
+    if (jj_3R_71()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_353()
+ {
+    if (jj_done) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
@@ -5596,6 +5581,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_352()
+ {
+    if (jj_done) return true;
+    if (jj_3R_72()) return true;
+    return false;
+  }
+
  inline bool jj_3R_351()
  {
     if (jj_done) return true;
@@ -5634,13 +5626,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_369()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(CHARACTER_LITERAL)) return true;
-    return false;
-  }
-
  inline bool jj_3R_390()
  {
     if (jj_done) return true;
@@ -5657,13 +5642,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_632()
+ inline bool jj_3R_369()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_90()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
-    if (jj_3R_268()) return true;
+    if (jj_scan_token(CHARACTER_LITERAL)) return true;
     return false;
   }
 
@@ -5674,17 +5656,20 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_633()
+ inline bool jj_3_97()
  {
     if (jj_done) return true;
-    if (jj_3R_632()) return true;
+    if (jj_3R_131()) return true;
     return false;
   }
 
- inline bool jj_3_97()
+ inline bool jj_3R_632()
  {
     if (jj_done) return true;
-    if (jj_3R_131()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_90()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
+    if (jj_3R_268()) return true;
     return false;
   }
 
@@ -5695,6 +5680,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_633()
+ {
+    if (jj_done) return true;
+    if (jj_3R_632()) return true;
+    return false;
+  }
+
  inline bool jj_3_96()
  {
     if (jj_done) return true;
@@ -5753,17 +5745,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_265()
- {
-    if (jj_done) return true;
-    if (jj_3R_74()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(155)) jj_scanpos = xsp;
-    if (jj_scan_token(COLON_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_417()
  {
     if (jj_done) return true;
@@ -5771,28 +5752,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_126()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_265()) jj_scanpos = xsp;
-    if (jj_scan_token(CASE_T)) return true;
-    if (jj_3R_61()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_632()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_633()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(CASE_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_634()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_328()
  {
     if (jj_done) return true;
@@ -5811,6 +5770,17 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_265()
+ {
+    if (jj_done) return true;
+    if (jj_3R_74()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(155)) jj_scanpos = xsp;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_567()
  {
     if (jj_done) return true;
@@ -5825,6 +5795,28 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_126()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_265()) jj_scanpos = xsp;
+    if (jj_scan_token(CASE_T)) return true;
+    if (jj_3R_61()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_632()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_633()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(CASE_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_634()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_565()
  {
     if (jj_done) return true;
@@ -5872,6 +5864,16 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_318()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_402()) jj_scanpos = xsp;
+    return false;
+  }
+
  inline bool jj_3R_522()
  {
     if (jj_done) return true;
@@ -5881,20 +5883,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_318()
+ inline bool jj_3R_254()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_402()) jj_scanpos = xsp;
+    if (jj_3R_379()) return true;
     return false;
   }
 
- inline bool jj_3R_254()
+ inline bool jj_3_95()
  {
     if (jj_done) return true;
-    if (jj_3R_379()) return true;
+    if (jj_3R_130()) return true;
     return false;
   }
 
@@ -5905,10 +5904,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_95()
+ inline bool jj_3_94()
  {
     if (jj_done) return true;
-    if (jj_3R_130()) return true;
+    if (jj_3R_129()) return true;
     return false;
   }
 
@@ -5922,13 +5921,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_94()
- {
-    if (jj_done) return true;
-    if (jj_3R_129()) return true;
-    return false;
-  }
-
  inline bool jj_3_93()
  {
     if (jj_done) return true;
@@ -5983,20 +5975,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_311()
- {
-    if (jj_done) return true;
-    if (jj_3R_398()) return true;
-    return false;
-  }
-
- inline bool jj_3_7()
- {
-    if (jj_done) return true;
-    if (jj_3R_67()) return true;
-    return false;
-  }
-
  inline bool jj_3R_118()
  {
     if (jj_done) return true;
@@ -6023,24 +6001,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_8()
- {
-    if (jj_done) return true;
-    if (jj_3R_68()) return true;
-    return false;
-  }
-
- inline bool jj_3R_310()
+ inline bool jj_3R_311()
  {
     if (jj_done) return true;
-    if (jj_3R_347()) return true;
+    if (jj_3R_398()) return true;
     return false;
   }
 
- inline bool jj_3R_309()
+ inline bool jj_3_7()
  {
     if (jj_done) return true;
-    if (jj_3R_397()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
@@ -6051,52 +6022,52 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_308()
+ inline bool jj_3_86()
  {
     if (jj_done) return true;
-    if (jj_3R_396()) return true;
+    if (jj_3R_121()) return true;
     return false;
   }
 
- inline bool jj_3R_307()
+ inline bool jj_3_8()
  {
     if (jj_done) return true;
-    if (jj_3R_395()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3_86()
+ inline bool jj_3R_310()
  {
     if (jj_done) return true;
-    if (jj_3R_121()) return true;
+    if (jj_3R_347()) return true;
     return false;
   }
 
- inline bool jj_3R_305()
+ inline bool jj_3R_309()
  {
     if (jj_done) return true;
-    if (jj_3R_394()) return true;
+    if (jj_3R_397()) return true;
     return false;
   }
 
- inline bool jj_3R_306()
+ inline bool jj_3R_308()
  {
     if (jj_done) return true;
-    if (jj_3R_67()) return true;
+    if (jj_3R_396()) return true;
     return false;
   }
 
- inline bool jj_3_85()
+ inline bool jj_3R_307()
  {
     if (jj_done) return true;
-    if (jj_3R_120()) return true;
+    if (jj_3R_395()) return true;
     return false;
   }
 
- inline bool jj_3R_304()
+ inline bool jj_3_85()
  {
     if (jj_done) return true;
-    if (jj_3R_393()) return true;
+    if (jj_3R_120()) return true;
     return false;
   }
 
@@ -6110,20 +6081,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_303()
- {
-    if (jj_done) return true;
-    if (jj_3R_392()) return true;
-    return false;
-  }
-
- inline bool jj_3R_302()
- {
-    if (jj_done) return true;
-    if (jj_3R_391()) return true;
-    return false;
-  }
-
  inline bool jj_3R_117()
  {
     if (jj_done) return true;
@@ -6164,6 +6121,49 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_305()
+ {
+    if (jj_done) return true;
+    if (jj_3R_394()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_306()
+ {
+    if (jj_done) return true;
+    if (jj_3R_67()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_304()
+ {
+    if (jj_done) return true;
+    if (jj_3R_393()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_524()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_63()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_303()
+ {
+    if (jj_done) return true;
+    if (jj_3R_392()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_302()
+ {
+    if (jj_done) return true;
+    if (jj_3R_391()) return true;
+    return false;
+  }
+
  inline bool jj_3R_301()
  {
     if (jj_done) return true;
@@ -6178,11 +6178,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_524()
+ inline bool jj_3_83()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_63()) return true;
+    if (jj_3R_117()) return true;
     return false;
   }
 
@@ -6214,6 +6213,17 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_268()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_83()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
  inline bool jj_3R_146()
  {
     if (jj_done) return true;
@@ -6260,21 +6270,33 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_83()
+ inline bool jj_3R_440()
  {
     if (jj_done) return true;
-    if (jj_3R_117()) return true;
+    if (jj_3R_63()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_524()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_268()
+ inline bool jj_3R_357()
  {
     if (jj_done) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_83()) { jj_scanpos = xsp; break; }
-    }
+    xsp = jj_scanpos;
+    if (!jj_3R_439()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_440()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_439()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
@@ -6307,36 +6329,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_440()
- {
-    if (jj_done) return true;
-    if (jj_3R_63()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_524()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
- inline bool jj_3R_357()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_439()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_440()) return true;
-    return false;
-  }
-
- inline bool jj_3R_439()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(ALL_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_276()
  {
     if (jj_done) return true;
@@ -6344,13 +6336,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_100()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(BIT_STRING_LITERAL)) return true;
-    return false;
-  }
-
  inline bool jj_3R_380()
  {
     if (jj_done) return true;
@@ -6359,17 +6344,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_430()
- {
-    if (jj_done) return true;
-    if (jj_3R_341()) return true;
-    return false;
-  }
-
- inline bool jj_3R_429()
+ inline bool jj_3R_100()
  {
     if (jj_done) return true;
-    if (jj_3R_73()) return true;
+    if (jj_scan_token(BIT_STRING_LITERAL)) return true;
     return false;
   }
 
@@ -6387,31 +6365,25 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_428()
+ inline bool jj_3R_430()
  {
     if (jj_done) return true;
-    if (jj_scan_token(USE_T)) return true;
-    if (jj_3R_521()) return true;
+    if (jj_3R_341()) return true;
     return false;
   }
 
- inline bool jj_3R_344()
+ inline bool jj_3R_429()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_428()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_429()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_430()) jj_scanpos = xsp;
+    if (jj_3R_73()) return true;
     return false;
   }
 
- inline bool jj_3R_249()
+ inline bool jj_3R_428()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
+    if (jj_scan_token(USE_T)) return true;
+    if (jj_3R_521()) return true;
     return false;
   }
 
@@ -6436,6 +6408,26 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_344()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_428()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_429()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_430()) jj_scanpos = xsp;
+    return false;
+  }
+
+ inline bool jj_3R_249()
+ {
+    if (jj_done) return true;
+    if (jj_3R_63()) return true;
+    return false;
+  }
+
  inline bool jj_3R_434()
  {
     if (jj_done) return true;
@@ -6548,6 +6540,14 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_258()
+ {
+    if (jj_done) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_115()
  {
     if (jj_done) return true;
@@ -6563,21 +6563,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_258()
- {
-    if (jj_done) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_372()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(RANGE_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_319()
  {
     if (jj_done) return true;
@@ -6600,6 +6585,20 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_372()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(RANGE_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_506()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(QNEQU_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_230()
  {
     if (jj_done) return true;
@@ -6618,13 +6617,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_506()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(QNEQU_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_505()
  {
     if (jj_done) return true;
@@ -6674,58 +6666,58 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_6()
+ inline bool jj_3R_499()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
+    if (jj_scan_token(LESSTHAN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_67()
+ inline bool jj_3R_498()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ATTRIBUTE_T)) return true;
-    if (jj_3R_74()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_161()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(GREATERTHAN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_499()
+ inline bool jj_3R_497()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LESSTHAN_T)) return true;
+    if (jj_scan_token(EQU_T)) return true;
     return false;
   }
 
- inline bool jj_3R_355()
+ inline bool jj_3R_496()
  {
     if (jj_done) return true;
-    if (jj_scan_token(REPORT_T)) return true;
-    if (jj_3R_61()) return true;
+    if (jj_scan_token(GT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_498()
+ inline bool jj_3_6()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GREATERTHAN_T)) return true;
+    if (jj_3R_66()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
     return false;
   }
 
- inline bool jj_3R_497()
+ inline bool jj_3R_67()
  {
     if (jj_done) return true;
-    if (jj_scan_token(EQU_T)) return true;
+    if (jj_scan_token(ATTRIBUTE_T)) return true;
+    if (jj_3R_74()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_161()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_496()
+ inline bool jj_3R_355()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GT_T)) return true;
+    if (jj_scan_token(REPORT_T)) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
@@ -6767,6 +6759,16 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_151()
+ {
+    if (jj_done) return true;
+    if (jj_3R_318()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_319()) jj_scanpos = xsp;
+    return false;
+  }
+
  inline bool jj_3R_169()
  {
     if (jj_done) return true;
@@ -6779,13 +6781,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_151()
+ inline bool jj_3R_697()
  {
     if (jj_done) return true;
-    if (jj_3R_318()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_319()) jj_scanpos = xsp;
+    if (jj_3R_705()) return true;
     return false;
   }
 
@@ -6797,13 +6796,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_697()
- {
-    if (jj_done) return true;
-    if (jj_3R_705()) return true;
-    return false;
-  }
-
  inline bool jj_3R_329()
  {
     if (jj_done) return true;
@@ -6814,14 +6806,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_257()
- {
-    if (jj_done) return true;
-    if (jj_3R_145()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_690()
  {
     if (jj_done) return true;
@@ -6839,14 +6823,11 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_120()
+ inline bool jj_3R_257()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_257()) jj_scanpos = xsp;
-    if (jj_3R_196()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_145()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
@@ -6866,33 +6847,22 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_86()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(RANGE_T)) return true;
-    if (jj_3R_88()) return true;
-    return false;
-  }
-
- inline bool jj_3R_196()
+ inline bool jj_3R_120()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ASSERT_T)) return true;
-    if (jj_3R_83()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_355()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_356()) jj_scanpos = xsp;
+    if (jj_3R_257()) jj_scanpos = xsp;
+    if (jj_3R_196()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3_5()
+ inline bool jj_3R_86()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ARRAY_T)) return true;
-    if (jj_3R_65()) return true;
-    if (jj_scan_token(OF_T)) return true;
+    if (jj_scan_token(RANGE_T)) return true;
+    if (jj_3R_88()) return true;
     return false;
   }
 
@@ -6910,6 +6880,19 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_196()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(ASSERT_T)) return true;
+    if (jj_3R_83()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_355()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_356()) jj_scanpos = xsp;
+    return false;
+  }
+
  inline bool jj_3R_190()
  {
     if (jj_done) return true;
@@ -6930,10 +6913,12 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_696()
+ inline bool jj_3_5()
  {
     if (jj_done) return true;
-    if (jj_3R_704()) return true;
+    if (jj_scan_token(ARRAY_T)) return true;
+    if (jj_3R_65()) return true;
+    if (jj_scan_token(OF_T)) return true;
     return false;
   }
 
@@ -6946,6 +6931,20 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_696()
+ {
+    if (jj_done) return true;
+    if (jj_3R_704()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_237()
+ {
+    if (jj_done) return true;
+    if (jj_3R_114()) return true;
+    return false;
+  }
+
  inline bool jj_3R_695()
  {
     if (jj_done) return true;
@@ -6964,13 +6963,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_237()
- {
-    if (jj_done) return true;
-    if (jj_3R_114()) return true;
-    return false;
-  }
-
  inline bool jj_3R_64()
  {
     if (jj_done) return true;
@@ -7024,20 +7016,20 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_244()
+ inline bool jj_3R_198()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_89()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_357()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_198()
+ inline bool jj_3R_244()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_357()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(NEW_T)) return true;
+    if (jj_3R_89()) return true;
     return false;
   }
 
@@ -7060,20 +7052,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_552()
- {
-    if (jj_done) return true;
-    if (jj_3R_321()) return true;
-    return false;
-  }
-
- inline bool jj_3R_551()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(CHARACTER_LITERAL)) return true;
-    return false;
-  }
-
  inline bool jj_3R_197()
  {
     if (jj_done) return true;
@@ -7082,23 +7060,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_550()
- {
-    if (jj_done) return true;
-    if (jj_3R_74()) return true;
-    return false;
-  }
-
- inline bool jj_3R_482()
+ inline bool jj_3R_552()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_550()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_551()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_552()) return true;
+    if (jj_3R_321()) return true;
     return false;
   }
 
@@ -7128,6 +7093,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_551()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(CHARACTER_LITERAL)) return true;
+    return false;
+  }
+
  inline bool jj_3R_358()
  {
     if (jj_done) return true;
@@ -7135,6 +7107,26 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_550()
+ {
+    if (jj_done) return true;
+    if (jj_3R_74()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_482()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_550()) return false;
+    jj_scanpos = xsp;
+    if (!jj_3R_551()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_552()) return true;
+    return false;
+  }
+
  inline bool jj_3R_199()
  {
     if (jj_done) return true;
@@ -7153,14 +7145,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_483()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_89()) return true;
-    return false;
-  }
-
  inline bool jj_3R_533()
  {
     if (jj_done) return true;
@@ -7182,19 +7166,11 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_393()
+ inline bool jj_3R_483()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ALIAS_T)) return true;
-    if (jj_3R_482()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_483()) jj_scanpos = xsp;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_63()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_484()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_89()) return true;
     return false;
   }
 
@@ -7205,17 +7181,19 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_114()
+ inline bool jj_3R_393()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_247()) return true;
+    if (jj_scan_token(ALIAS_T)) return true;
+    if (jj_3R_482()) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_248()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RPAREN_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_483()) jj_scanpos = xsp;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_63()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_484()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
@@ -7254,17 +7232,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_282()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(MINUS_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_283()
+ inline bool jj_3R_114()
  {
     if (jj_done) return true;
-    if (jj_scan_token(AMPERSAND_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_247()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_248()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
@@ -7275,31 +7253,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_3()
- {
-    if (jj_done) return true;
-    if (jj_3R_63()) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_133()
+ inline bool jj_3R_282()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_281()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_282()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_283()) return true;
+    if (jj_scan_token(MINUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_281()
+ inline bool jj_3R_283()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PLUS_T)) return true;
+    if (jj_scan_token(AMPERSAND_T)) return true;
     return false;
   }
 
@@ -7341,6 +7305,14 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_3()
+ {
+    if (jj_done) return true;
+    if (jj_3R_63()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_342()
  {
     if (jj_done) return true;
@@ -7350,27 +7322,30 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_2()
+ inline bool jj_3R_133()
  {
     if (jj_done) return true;
-    if (jj_3R_62()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_281()) return false;
+    jj_scanpos = xsp;
+    if (!jj_3R_282()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_283()) return true;
     return false;
   }
 
- inline bool jj_3R_516()
+ inline bool jj_3R_281()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_62()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(PLUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_515()
+ inline bool jj_3_2()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BOX_T)) return true;
+    if (jj_3R_62()) return true;
     return false;
   }
 
@@ -7393,23 +7368,20 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_514()
+ inline bool jj_3R_516()
  {
     if (jj_done) return true;
+    if (jj_3R_63()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
     if (jj_3R_62()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_419()
+ inline bool jj_3R_515()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_514()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_515()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_516()) return true;
+    if (jj_scan_token(BOX_T)) return true;
     return false;
   }
 
@@ -7423,10 +7395,23 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_236()
+ inline bool jj_3R_514()
  {
     if (jj_done) return true;
-    if (jj_3R_169()) return true;
+    if (jj_3R_62()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_419()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_514()) return false;
+    jj_scanpos = xsp;
+    if (!jj_3R_515()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_516()) return true;
     return false;
   }
 
@@ -7451,10 +7436,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_1()
+ inline bool jj_3R_236()
  {
     if (jj_done) return true;
-    if (jj_3R_61()) return true;
+    if (jj_3R_169()) return true;
     return false;
   }
 
@@ -7465,10 +7450,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_155()
+ inline bool jj_3_1()
  {
     if (jj_done) return true;
-    if (jj_3R_74()) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
@@ -7519,10 +7504,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_154()
+ inline bool jj_3R_155()
  {
     if (jj_done) return true;
-    if (jj_3R_61()) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
@@ -7533,52 +7518,51 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_153()
+ inline bool jj_3_71()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OPEN_T)) return true;
+    if (jj_3R_112()) return true;
     return false;
   }
 
- inline bool jj_3R_62()
+ inline bool jj_3R_154()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_153()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_154()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_155()) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
- inline bool jj_3_71()
+ inline bool jj_3R_475()
  {
     if (jj_done) return true;
-    if (jj_3R_112()) return true;
+    if (jj_3R_114()) return true;
     return false;
   }
 
- inline bool jj_3R_475()
+ inline bool jj_3R_153()
  {
     if (jj_done) return true;
-    if (jj_3R_114()) return true;
+    if (jj_scan_token(OPEN_T)) return true;
     return false;
   }
 
- inline bool jj_3_70()
+ inline bool jj_3R_62()
  {
     if (jj_done) return true;
-    if (jj_3R_111()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_153()) return false;
+    jj_scanpos = xsp;
+    if (!jj_3R_154()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_155()) return true;
     return false;
   }
 
- inline bool jj_3R_658()
+ inline bool jj_3_70()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ACCESS_T)) return true;
-    if (jj_3R_89()) return true;
+    if (jj_3R_111()) return true;
     return false;
   }
 
@@ -7603,10 +7587,11 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_235()
+ inline bool jj_3R_658()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BASED_LITERAL)) return true;
+    if (jj_scan_token(ACCESS_T)) return true;
+    if (jj_3R_89()) return true;
     return false;
   }
 
@@ -7619,58 +7604,65 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_234()
+ inline bool jj_3R_472()
  {
     if (jj_done) return true;
-    if (jj_scan_token(INTEGER)) return true;
+    if (jj_3R_112()) return true;
     return false;
   }
 
- inline bool jj_3R_472()
+ inline bool jj_3R_702()
  {
     if (jj_done) return true;
-    if (jj_3R_112()) return true;
+    if (jj_3R_63()) return true;
     return false;
   }
 
- inline bool jj_3R_109()
+ inline bool jj_3_67()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_233()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_234()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_235()) return true;
+    if (jj_3R_110()) return true;
     return false;
   }
 
- inline bool jj_3R_233()
+ inline bool jj_3R_235()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DECIMAL_LITERAL)) return true;
+    if (jj_scan_token(BASED_LITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_702()
+ inline bool jj_3R_471()
  {
     if (jj_done) return true;
-    if (jj_3R_63()) return true;
+    if (jj_3R_111()) return true;
     return false;
   }
 
- inline bool jj_3_67()
+ inline bool jj_3R_234()
  {
     if (jj_done) return true;
-    if (jj_3R_110()) return true;
+    if (jj_scan_token(INTEGER)) return true;
     return false;
   }
 
- inline bool jj_3R_471()
+ inline bool jj_3R_109()
  {
     if (jj_done) return true;
-    if (jj_3R_111()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (!jj_3R_233()) return false;
+    jj_scanpos = xsp;
+    if (!jj_3R_234()) return false;
+    jj_scanpos = xsp;
+    if (jj_3R_235()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_233()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(DECIMAL_LITERAL)) return true;
     return false;
   }
 
@@ -8522,6 +8514,14 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_207()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(VARASSIGN_T)) return true;
+    if (jj_3R_61()) return true;
+    return false;
+  }
+
 
 public: 
   void setErrorHandler(ErrorHandler *eh) {
diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj
index e263289..ed4500a 100755
--- a/vhdlparser/vhdlparser.jj
+++ b/vhdlparser/vhdlparser.jj
@@ -979,19 +979,23 @@ return s1;
 
 QCString element_declaration() :  {QCString rec_name,s1,s2;}
 {
-rec_name=identifier_list() <COLON_T> s1=subtype_indication() <SEMI_T>
-{
-   QCString name;
-   QCStringList ql=QCStringList::split(",",rec_name);
-   for (uint j=0;j<ql.count();j++)
-   {
-    name=ql[j]+"~";
-    name+=outlineParser()->getNameID().data();;
-    outlineParser()->addVhdlType(name.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s1.data(),Public);
-   }
-   s2=rec_name+":"+s1;
-   return s2;
- }
+  rec_name=identifier_list() <COLON_T> s1=subtype_indication() <SEMI_T>
+  {
+    auto ql = split(rec_name.str(),",");
+    for (const auto &n : ql)
+    {
+      std::string name=n+"~";
+      name+=outlineParser()->getNameID().data();
+      outlineParser()->addVhdlType(
+          name.c_str(),outlineParser()->getLine(),
+          Entry::VARIABLE_SEC,
+          VhdlDocGen::RECORD,0,
+          s1.data(),
+          Public);
+    }
+    s2=rec_name+":"+s1;
+    return s2;
+  }
 }
 
 
@@ -2465,14 +2469,22 @@ QCString unconstraint_array_definition() :  {QCString s,s1,s2,s3;}
 {
  <USE_T> s=selected_name()(<COMMA_T> s1=selected_name(){s+=",";s+=s1;})*   <SEMI_T>
   {
-                   QCStringList ql1=QCStringList::split(",",s);
-                   for (uint j=0;j<ql1.count();j++)
+                   auto ql1=split(s.str(),",");
+                   for (const auto &name : ql1)
                    {
-                     QCStringList ql=QCStringList::split(".",ql1[j]);
-                     QCString it=ql[1];
-                     if ( m_sharedState->parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) )
+                     auto ql2=split(name,".");
+                     if (ql2.size()>1)
                      {
-                       outlineParser()->addVhdlType(it.data(),outlineParser()->getLine(),Entry::VARIABLE_SEC,VhdlDocGen::USE,it.data(),"_use_",Public);
+                       std::string it=ql2[1];
+                       if ( m_sharedState->parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) )
+                       {
+                         outlineParser()->addVhdlType(it.c_str(),
+                                                      outlineParser()->getLine(),
+                                                      Entry::VARIABLE_SEC,
+                                                      VhdlDocGen::USE,
+                                                      it.c_str(),
+                                                      "_use_",Public);
+                       }
                      }
                    }
                    s1="use "+s;